summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorjoerg <joerg>2013-10-26 23:23:41 +0000
committerjoerg <joerg>2013-10-26 23:23:41 +0000
commitdafb21927c64fc28f02128fa7bc23e1a000b10fe (patch)
tree5d375b52f7f90318500bacee48ca17e7ad935181 /emulators
parentbc6ff56e44d8895af7eed5c7edb08f6d1a1ea58a (diff)
downloadpkgsrc-dafb21927c64fc28f02128fa7bc23e1a000b10fe.tar.gz
Provide some sane ARFLAGS.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu/distinfo4
-rw-r--r--emulators/qemu/patches/patch-et12
2 files changed, 12 insertions, 4 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 548d5c8c181..0f2bd016c0d 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.88 2013/10/13 12:37:58 ryoon Exp $
+$NetBSD: distinfo,v 1.89 2013/10/26 23:23:41 joerg Exp $
SHA1 (qemu-1.6.1.tar.bz2) = ad3ef3709a8ce3a39bd343aa313cefd033afb561
RMD160 (qemu-1.6.1.tar.bz2) = 96dcbb044812ab0349741bd62eb8e6b79552442f
Size (qemu-1.6.1.tar.bz2) = 12041317 bytes
SHA1 (patch-ef) = 871ccf29463dec1bd56d7f7808248c5b1af4d4d6
-SHA1 (patch-et) = fcb253cac9644075a5fcca3733b7260bbaf6f689
+SHA1 (patch-et) = 939a5555ed1aadae007003951e3aae90ead35ef6
SHA1 (patch-hw_display_omap__dss.c) = af89754a9a078a5b52240473d85351bd447623c0
SHA1 (patch-hw_net_etraxfs__eth.c) = 444c6f8a8ad26d9762bfc8a0672afbc7b858fc9d
SHA1 (patch-hw_net_xilinx__axienet.c) = 02461c2cd2985c352626e46ba93844606783460e
diff --git a/emulators/qemu/patches/patch-et b/emulators/qemu/patches/patch-et
index 5e0e387ca82..1590782214d 100644
--- a/emulators/qemu/patches/patch-et
+++ b/emulators/qemu/patches/patch-et
@@ -1,8 +1,16 @@
-$NetBSD: patch-et,v 1.10 2013/10/13 12:37:58 ryoon Exp $
+$NetBSD: patch-et,v 1.11 2013/10/26 23:23:41 joerg Exp $
--- Makefile.orig 2013-10-09 19:20:32.000000000 +0000
+++ Makefile
-@@ -329,8 +329,9 @@ endif
+@@ -148,6 +148,7 @@ $(SRC_PATH)/pixman/configure:
+ DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
+ DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
+ DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
++ARFLAGS= -rc
+
+ subdir-dtc:dtc/libfdt dtc/tests
+ $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)
+@@ -329,8 +330,9 @@ endif
install-confdir:
$(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"