diff options
| author | hubertf <hubertf> | 2013-10-27 16:33:25 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2013-10-27 16:33:25 +0000 |
| commit | f3a7c661fae20b6ea73d26db69c958682ed4480d (patch) | |
| tree | a356c4f2a3984cf4fd07ae0e7b22be10d4008360 /emulators | |
| parent | 2ea9cf86434ad618fafdfbfd53e8ce0fe772ced7 (diff) | |
| download | pkgsrc-f3a7c661fae20b6ea73d26db69c958682ed4480d.tar.gz | |
Make this build on Mac OS X 10.7.x - the linker needs ranlink ran
(via ar), else it will fail to link.
OK joerg@
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/qemu/Makefile | 4 | ||||
| -rw-r--r-- | emulators/qemu/distinfo | 4 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-et | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 13a79ea67ef..757406fe64c 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.118 2013/10/26 13:39:37 asau Exp $ +# $NetBSD: Makefile,v 1.119 2013/10/27 16:33:25 hubertf Exp $ DISTNAME= qemu-1.6.1 +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/ EXTRACT_SUFX= .tar.bz2 @@ -34,6 +35,7 @@ CONFIGURE_ARGS+= --python=${PYTHONBIN} CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --enable-curses +#HF#CONFIGURE_ARGS+= --disable-fdt # HF: build on OS X CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} CONF_FILES= ${EGDIR}/target-x86_64.conf \ diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 0f2bd016c0d..254430e6833 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.89 2013/10/26 23:23:41 joerg Exp $ +$NetBSD: distinfo,v 1.90 2013/10/27 16:33:25 hubertf 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) = 939a5555ed1aadae007003951e3aae90ead35ef6 +SHA1 (patch-et) = 2c063468081f9b38d8adfdf4886e1ecb0f97529f 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 1590782214d..13365128570 100644 --- a/emulators/qemu/patches/patch-et +++ b/emulators/qemu/patches/patch-et @@ -1,4 +1,4 @@ -$NetBSD: patch-et,v 1.11 2013/10/26 23:23:41 joerg Exp $ +$NetBSD: patch-et,v 1.12 2013/10/27 16:33:25 hubertf Exp $ --- Makefile.orig 2013-10-09 19:20:32.000000000 +0000 +++ Makefile @@ -6,7 +6,7 @@ $NetBSD: patch-et,v 1.11 2013/10/26 23:23:41 joerg Exp $ 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 ++ARFLAGS= -rcs 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,) |