summaryrefslogtreecommitdiff
path: root/emulators/qemu-utils/files
diff options
context:
space:
mode:
authorAlan Somers <asomers@FreeBSD.org>2019-12-01 15:50:23 +0000
committerAlan Somers <asomers@FreeBSD.org>2019-12-01 15:50:23 +0000
commitcd2f604c6e534182d2ea1161ebfc26e2c297d1c7 (patch)
treed2f9e3b2c81843f957bfc1abefe24621cb69d097 /emulators/qemu-utils/files
parentAdd patch to fix problem with keyring rewriting. (diff)
emulators/qemu-utils: fix build after r518397
PR: 242279 Reported by: pkg-fallout
Diffstat (limited to 'emulators/qemu-utils/files')
-rw-r--r--emulators/qemu-utils/files/patch-Makefile6
-rw-r--r--emulators/qemu-utils/files/patch-configure2
2 files changed, 4 insertions, 4 deletions
diff --git a/emulators/qemu-utils/files/patch-Makefile b/emulators/qemu-utils/files/patch-Makefile
index ca87881dba28..95a3110abd24 100644
--- a/emulators/qemu-utils/files/patch-Makefile
+++ b/emulators/qemu-utils/files/patch-Makefile
@@ -41,6 +41,6 @@
- $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
- done
- $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
- for d in $(TARGET_DIRS); do \
- $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
- done
+
+ .PHONY: ctags
+ ctags:
diff --git a/emulators/qemu-utils/files/patch-configure b/emulators/qemu-utils/files/patch-configure
index 3d69293d3e2b..a4ffd8f03a38 100644
--- a/emulators/qemu-utils/files/patch-configure
+++ b/emulators/qemu-utils/files/patch-configure
@@ -4,7 +4,7 @@
##########################################
# pixman support probe
--if test "$want_tools" = "no" -a "$softmmu" = "no"; then
+-if test "$want_tools" = "no" && test "$softmmu" = "no"; then
+if test "$softmmu" = "no"; then
pixman_cflags=
pixman_libs=