Attachment #180737 for bug #217717

View | Details | Raw Unified | Return to bug 217717
Collapse All | Expand All




MASTERDIR=	${.CURDIR}/../qemu
PLIST=		${.CURDIR}/pkg-plist
DESCR=		${.CURDIR}/pkg-descr
EXTRA_PATCHES=	${.CURDIR}/files/patch-configure
PKGMESSAGE=

PORTDOCS=	qemu-doc.html qmp-commands.txt

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} \




--- 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

Return to bug 217717

Lines 19-31 Link Here

(-)emulators/qemu-utils/Makefile (-3 / +4 lines)
19	MASTERDIR= ${.CURDIR}/../qemu	19	MASTERDIR= ${.CURDIR}/../qemu
20	PLIST= ${.CURDIR}/pkg-plist	20	PLIST= ${.CURDIR}/pkg-plist
21	DESCR= ${.CURDIR}/pkg-descr	21	DESCR= ${.CURDIR}/pkg-descr
22	EXTRA_PATCHES= ${.CURDIR}/files/patch-Makefile ${.CURDIR}/files/patch-configure	22	EXTRA_PATCHES= ${.CURDIR}/files/patch-configure
23	PKGMESSAGE=	23	PKGMESSAGE=
24		24
25	PORTDOCS= qemu-doc.html qemu-tech.html qmp-commands.txt	25	PORTDOCS= qemu-doc.html qmp-commands.txt
26		26
27	CONFIGURE_ARGS=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \	27	CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
28	--disable-libssh2 \	28	--disable-libssh2 \
		29	--mandir=${MANPREFIX}/man \
29	--prefix=${PREFIX} --cc=${CC} --disable-kvm \	30	--prefix=${PREFIX} --cc=${CC} --disable-kvm \
30	--disable-linux-user --disable-linux-aio --disable-xen \	31	--disable-linux-user --disable-linux-aio --disable-xen \
31	--python=${PYTHON_CMD} \	32	--python=${PYTHON_CMD} \

Lines 1-14 Link Here

(-)emulators/qemu-utils/files/patch-Makefile (-14 lines)
1	--- Makefile.orig 2016-10-04 19:25:28 UTC
2	+++ Makefile
3	@@ -464,11 +464,6 @@ endif
4	ifeq ($(CONFIG_GTK),y)
5	$(MAKE) -C po $@
6	endif
7	- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
8	- set -e; for x in $(KEYMAPS); do \
9	- $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
10	- done
11	- $(INSTALL_DATA) $(SRC_PATH)/trace-events "$(DESTDIR)$(qemu_datadir)/trace-events"
12	for d in $(TARGET_DIRS); do \
13	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ \|\| exit 1 ; \
14	done