diff options
| author | bouyer <bouyer@pkgsrc.org> | 2014-08-28 14:30:03 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2014-08-28 14:30:03 +0000 |
| commit | 4bbc9fd5b730420f8b7b1e04ffc97d8d1046d16c (patch) | |
| tree | 0c6011eed21de54e43923cbf0a439b076d759599 | |
| parent | 72f0084eb07a2c716ae806d657dedb4f21426e42 (diff) | |
| download | pkgsrc-4bbc9fd5b730420f8b7b1e04ffc97d8d1046d16c.tar.gz | |
Don't redefine MAP_ANONYMOUS is already defined. Fixes build on netbsd-7
| -rw-r--r-- | sysutils/xentools41/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/xentools41/patches/patch-da | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo index e652f6c0110..75b84d3f283 100644 --- a/sysutils/xentools41/distinfo +++ b/sysutils/xentools41/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2014/05/14 20:22:41 bouyer Exp $ +$NetBSD: distinfo,v 1.37 2014/08/28 14:30:03 bouyer Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -36,7 +36,7 @@ SHA1 (patch-cf) = c8740b1c9cfac686f2e4e32c7613b5f02206459d SHA1 (patch-cg) = 119029fda1d4ecee90d0a108151596cb3ef0ec74 SHA1 (patch-ch) = 84e816c95167828314ef901e324772249a407c41 SHA1 (patch-config_StdGNU.mk) = bbded4d6da3fae55bfd8dad42ac9b45721ee1ebe -SHA1 (patch-da) = 1a7ecd9536340deac2945786b9faae55680525ca +SHA1 (patch-da) = 06c07b32d70f8259a762ebcdc738218cfad57ad4 SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3 diff --git a/sysutils/xentools41/patches/patch-da b/sysutils/xentools41/patches/patch-da index 9542ede52e7..99881b60cf5 100644 --- a/sysutils/xentools41/patches/patch-da +++ b/sysutils/xentools41/patches/patch-da @@ -1,8 +1,8 @@ -$NetBSD: patch-da,v 1.2 2011/05/07 16:55:58 tnn Exp $ +$NetBSD: patch-da,v 1.3 2014/08/28 14:30:03 bouyer Exp $ ---- ioemu-qemu-xen/configure.orig 2011-02-11 17:54:51.000000000 +0000 -+++ ioemu-qemu-xen/configure -@@ -1089,7 +1089,7 @@ fi +--- ioemu-qemu-xen/configure.orig 2013-07-17 12:59:40.000000000 +0200 ++++ ioemu-qemu-xen/configure 2014-08-28 13:59:55.000000000 +0200 +@@ -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-da,v 1.2 2011/05/07 16:55:58 tnn Exp $ 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-da,v 1.2 2011/05/07 16:55:58 tnn Exp $ 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-da,v 1.2 2011/05/07 16:55:58 tnn Exp $ 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 + |