diff options
| author | bouyer <bouyer@pkgsrc.org> | 2014-09-17 20:32:36 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2014-09-17 20:32:36 +0000 |
| commit | 347dbcda2892187e3f38cc862ebba2bd68039ea0 (patch) | |
| tree | 9349fa7f8e71a6f9804bada694ccd53b21cbc580 /sysutils | |
| parent | f5e2acadd0e94523d4996e6f1c405d178a311438 (diff) | |
| download | pkgsrc-347dbcda2892187e3f38cc862ebba2bd68039ea0.tar.gz | |
Apply a fix similar to
http://mail-index.netbsd.org/pkgsrc-changes/2014/08/28/msg110551.html:
Don't redefine MAP_ANONYMOUS is already defined. Fixes build on netbsd-7
pointed out by Mustafa Dogan in private mail
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xentools42/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/xentools42/patches/patch-qemu-xen-traditional_configure | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo index 2d3d7dcc444..b183ddb59cc 100644 --- a/sysutils/xentools42/distinfo +++ b/sysutils/xentools42/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2014/02/22 01:28:23 prlw1 Exp $ +$NetBSD: distinfo,v 1.11 2014/09/17 20:32:36 bouyer Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -53,7 +53,7 @@ SHA1 (patch-python_xen_xend_osdep.py) = 8da6bba38bd7677ea829ca35058f7d2d1d7acad4 SHA1 (patch-python_xen_xm_create.py) = 7b25b3b3a8d58effae395d776f2a4b94d79acfcb SHA1 (patch-qemu-xen-traditional_Makefile) = 0fcd7d5342269e87f14ff76be05d8757151438bc SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = 6376edcc57313c2ffe9bb3d88043d160d1f644ec -SHA1 (patch-qemu-xen-traditional_configure) = 8b14e6932441d0666092ef4f63d0acd99db0df51 +SHA1 (patch-qemu-xen-traditional_configure) = 0f09a0128762dc7d083e5986908fed5b7746a981 SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = a8faf95491867c19471690ae98df93ff1d73114a SHA1 (patch-qemu-xen-traditional_hw_ide.c) = d562c36627e861658e7a1d52514e59368871cbdb SHA1 (patch-qemu-xen-traditional_hw_pass-through.c) = d1f3a1842c595e2d261b997bac02bb71de41eaac diff --git a/sysutils/xentools42/patches/patch-qemu-xen-traditional_configure b/sysutils/xentools42/patches/patch-qemu-xen-traditional_configure index f21d205d590..60caf346105 100644 --- a/sysutils/xentools42/patches/patch-qemu-xen-traditional_configure +++ b/sysutils/xentools42/patches/patch-qemu-xen-traditional_configure @@ -1,8 +1,8 @@ -$NetBSD: patch-qemu-xen-traditional_configure,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ +$NetBSD: patch-qemu-xen-traditional_configure,v 1.2 2014/09/17 20:32:36 bouyer Exp $ ---- qemu-xen-traditional/configure.orig 2011-02-11 17:54:51.000000000 +0000 -+++ qemu-xen-traditional/configure -@@ -1089,7 +1089,7 @@ fi +--- qemu-xen-traditional/configure.orig 2014-01-09 12:44:42.000000000 +0000 ++++ qemu-xen-traditional/configure 2014-09-17 13:10:43.000000000 +0000 +@@ -1089,7 +1089,7 @@ # Check if tools are available to build documentation. if [ -x "`which texi2html 2>/dev/null`" ] && \ [ -x "`which pod2man 2>/dev/null`" ]; then @@ -11,7 +11,7 @@ $NetBSD: patch-qemu-xen-traditional_configure,v 1.1 2013/05/15 06:58:50 jnemeth fi ########################################## -@@ -1124,7 +1124,7 @@ else +@@ -1124,7 +1124,7 @@ if test -z "$prefix" ; then prefix="/usr/local" fi @@ -20,7 +20,7 @@ $NetBSD: patch-qemu-xen-traditional_configure,v 1.1 2013/05/15 06:58:50 jnemeth datasuffix="/share/qemu" docsuffix="/share/doc/qemu" binsuffix="/bin" -@@ -1215,6 +1215,9 @@ echo "docdir=\${prefix}$docsuffix" >> $c +@@ -1215,6 +1215,9 @@ echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h echo "MAKE=$make" >> $config_mak echo "INSTALL=$install" >> $config_mak @@ -30,3 +30,13 @@ $NetBSD: patch-qemu-xen-traditional_configure,v 1.1 2013/05/15 06:58:50 jnemeth echo "CC=$cc" >> $config_mak echo "HOST_CC=$host_cc" >> $config_mak echo "AR=$ar" >> $config_mak +@@ -1492,7 +1495,9 @@ + # XXX: suppress that + if [ "$bsd" = "yes" ] ; then + echo "#define O_LARGEFILE 0" >> $config_h ++ echo "#ifndef MAP_ANONYMOUS" >> $config_h + echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h ++ echo "#endif" >> $config_h + echo "#define _BSD 1" >> $config_h + fi + |