diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2017-04-20 05:57:47 +0000 |
|---|---|---|
| committer | Alan Somers <asomers@FreeBSD.org> | 2017-04-20 05:57:47 +0000 |
| commit | a393a488dff8b2cb2ea40752f1255f30c03d4c56 (patch) | |
| tree | 1360b00a2efce46e619930e9127942753ebf0b2b /emulators/qemu-utils | |
| parent | 80b980d6f09d45d6863c87fededea19937deb48b (diff) | |
| download | ports-a393a488dff8b2cb2ea40752f1255f30c03d4c56.tar.gz ports-a393a488dff8b2cb2ea40752f1255f30c03d4c56.zip | |
emulators/qemu-utils: fix build after r435826
PR: 217717
Reported by: pkg-fallout
Reviewed by: brd
Approved by: brd (ports)
MFH: 2017Q1
Notes
Notes:
svn path=/head/; revision=438925
Diffstat (limited to 'emulators/qemu-utils')
| -rw-r--r-- | emulators/qemu-utils/Makefile | 7 | ||||
| -rw-r--r-- | emulators/qemu-utils/files/patch-Makefile | 14 |
2 files changed, 4 insertions, 17 deletions
diff --git a/emulators/qemu-utils/Makefile b/emulators/qemu-utils/Makefile index d7eaa0f272c9..57ba7ff60393 100644 --- a/emulators/qemu-utils/Makefile +++ b/emulators/qemu-utils/Makefile @@ -19,13 +19,14 @@ OPTIONS_EXCLUDE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ MASTERDIR= ${.CURDIR}/../qemu PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr -EXTRA_PATCHES= ${.CURDIR}/files/patch-Makefile ${.CURDIR}/files/patch-configure +EXTRA_PATCHES= ${.CURDIR}/files/patch-configure PKGMESSAGE= -PORTDOCS= qemu-doc.html qemu-tech.html qmp-commands.txt +PORTDOCS= qemu-doc.html qmp-commands.txt -CONFIGURE_ARGS=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ +CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --disable-libssh2 \ + --mandir=${MANPREFIX}/man \ --prefix=${PREFIX} --cc=${CC} --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --python=${PYTHON_CMD} \ diff --git a/emulators/qemu-utils/files/patch-Makefile b/emulators/qemu-utils/files/patch-Makefile deleted file mode 100644 index a55b7448f599..000000000000 --- a/emulators/qemu-utils/files/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.orig 2016-10-04 19:25:28 UTC -+++ Makefile -@@ -464,11 +464,6 @@ endif - ifeq ($(CONFIG_GTK),y) - $(MAKE) -C po $@ - endif -- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" -- set -e; for x in $(KEYMAPS); do \ -- $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ -- done -- $(INSTALL_DATA) $(SRC_PATH)/trace-events "$(DESTDIR)$(qemu_datadir)/trace-events" - for d in $(TARGET_DIRS); do \ - $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ - done |