cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r562222 r562224

Browse Source 
emulators/qemu-utils: unbreak after r553312

Due to many breaking changes temporarily switch to qemu42.

===>  Applying extra patch files/patch-configure
1 out of 2 hunks failed--saving rejects to configure.rej
===>  Applying extra patch files/patch-Makefile
2 out of 3 hunks failed--saving rejects to Makefile.rej
ERROR: unknown option --disable-bluez
strip: open ../stage/usr/local/bin/qemu-* failed: No such file or directory

PR:		252498
This commit is contained in:
Jan Beich 2021-01-23 22:50:42 +00:00
parent 0f2063f75b
commit e3fbaab826
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2021Q1/; revision=562423
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emulators/qemu-utils/Makefile
View File

@ -5,8 +5,6 @@ PKGNAMESUFFIX= -utils
MAINTAINER= ken@FreeBSD.org
COMMENT= QEMU userland utilities
BROKEN= fails to patch
HAS_CONFIGURE= yes
USES= compiler:c11 cpe gettext-runtime gmake gnome perl5 pkgconfig \
python:build tar:xz
@ -18,7 +16,7 @@ OPTIONS_SLAVE= DOCS
OPTIONS_EXCLUDE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
STATIC_LINK NCURSES VDE
MASTERDIR= ${.CURDIR}/../qemu
MASTERDIR= ${.CURDIR}/../qemu42
PLIST= ${.CURDIR}/pkg-plist
DESCR= ${.CURDIR}/pkg-descr
EXTRA_PATCHES= ${.CURDIR}/files/patch-configure

6
emulators/qemu42/Makefile
View File

@ -5,7 +5,7 @@ PORTNAME= qemu
PORTVERSION= 4.2.1
CATEGORIES= emulators
MASTER_SITES= https://download.qemu.org/
PKGNAMESUFFIX= 42
PKGNAMESUFFIX?= 42
DIST_SUBDIR= qemu/${PORTVERSION}
MAINTAINER?= bofh@FreeBSD.org
@ -21,11 +21,13 @@ LIB_DEPENDS?= libnettle.so:security/nettle \
libpcre2-8.so:devel/pcre2 \
libfdt.so:sysutils/dtc
.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent")
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64
USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \
pkgconfig python:build tar:xz xorg
USE_XORG= pixman
USE_GNOME= cairo glib20 libxml2
.endif
USE_PERL5= build
@ -103,9 +105,11 @@ VDE_LIB_DEPENDS= libvdeplug.so:net/vde2
X11_CONFIGURE_ENABLE= sdl
X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2
X11_USES= sdl
.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent")
X86_TARGETS_USE_OFF= XORG=pixman,x11
X86_TARGETS_USES_OFF= xorg
INSTALLS_ICONS= yes
.endif
PORTDOCS?= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \
qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/*