summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert>2016-05-23 05:15:38 +0000
committerbsiegert <bsiegert>2016-05-23 05:15:38 +0000
commit0eefd2d54cc1b44c8992095306a49d4ad26b3497 (patch)
treed2664626d68459d3a8ddcc9547428c2ccf14c6b4
parent9806582de1e07f15eebbf4f684e16dfa4583ba3e (diff)
downloadpkgsrc-0eefd2d54cc1b44c8992095306a49d4ad26b3497.tar.gz
Pullup ticket #5024 - requested by joerg
sysutils/xentools33: build fix Revisions pulled up: - sysutils/xentools33/Makefile 1.50 - sysutils/xentools33/distinfo 1.32 - sysutils/xentools33/patches/patch-fs-back_Makefile 1.1 --- Module Name: pkgsrc Committed By: joerg Date: Wed May 18 21:24:44 UTC 2016 Modified Files: pkgsrc/sysutils/xentools33: Makefile distinfo Added Files: pkgsrc/sysutils/xentools33/patches: patch-fs-back_Makefile Log Message: Add missing rpath. Make a bunch of GCC warnings non-fatal. Bump revision.
-rw-r--r--sysutils/xentools33/Makefile6
-rw-r--r--sysutils/xentools33/distinfo3
-rw-r--r--sysutils/xentools33/patches/patch-fs-back_Makefile13
3 files changed, 19 insertions, 3 deletions
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile
index c9719fc5f93..486de33b887 100644
--- a/sysutils/xentools33/Makefile
+++ b/sysutils/xentools33/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2016/02/26 10:24:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.49.2.1 2016/05/23 05:15:38 bsiegert Exp $
VERSION= 3.3.2
DISTNAME= xen-${VERSION}
PKGNAME= xentools33-${VERSION}
-PKGREVISION= 19
+PKGREVISION= 20
CATEGORIES= sysutils
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
@@ -151,6 +151,8 @@ EXTRA_CFLAGS+= -Wno-error=ignored-attributes -no-integrated-as \
-Wno-error=tautological-compare -Wno-error=null-dereference \
-Wno-error=self-assign -Wno-error=sometimes-uninitialized \
-Wno-error=unused-function
+.elif !empty(PKGSRC_COMPILER:Mgcc)
+EXTRA_CFLAGS+= -Wno-error=unused-but-set-variable
.endif
MAKE_ENV+= EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:Q}
diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo
index 47b6dcf1f23..f33e3d572e3 100644
--- a/sysutils/xentools33/distinfo
+++ b/sysutils/xentools33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2015/11/04 01:32:40 agc Exp $
+$NetBSD: distinfo,v 1.31.4.1 2016/05/23 05:15:38 bsiegert Exp $
SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
@@ -58,6 +58,7 @@ SHA1 (patch-fd) = 619b865b2f17814e6e62ebab21de9183474dd075
SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3
SHA1 (patch-ff) = 6ff97fa4f34f29c276e4aaab4b4db9ccf7b09957
SHA1 (patch-fg) = 913295d341c1dd5bf4d1ef78f27520920f138d4c
+SHA1 (patch-fs-back_Makefile) = ef6908d5f9fa33817f1b029a75badb6fe49ad653
SHA1 (patch-io_ring_h) = 83b01462d5d2b48b4f97b3d9a7980aa3300ad0b3
SHA1 (patch-ioemu_block-vvfat.c) = 4e6d998fe2c006bb68caaf8e1d11e641319ff5c2
SHA1 (patch-libfsimage_ufs_ufs.h) = dc59f33cf3abd08a8cdee5977ca4168613327513
diff --git a/sysutils/xentools33/patches/patch-fs-back_Makefile b/sysutils/xentools33/patches/patch-fs-back_Makefile
new file mode 100644
index 00000000000..4ae058b601f
--- /dev/null
+++ b/sysutils/xentools33/patches/patch-fs-back_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-fs-back_Makefile,v 1.1.2.2 2016/05/23 05:15:38 bsiegert Exp $
+
+--- fs-back/Makefile.orig 2016-05-18 11:39:28.000000000 +0000
++++ fs-back/Makefile
+@@ -13,7 +13,7 @@ CFLAGS += $(CFLAGS_libxenstore)
+ CFLAGS += $(INCLUDES) -I.
+ CFLAGS += -D_GNU_SOURCE
+
+-LIBS := -L. -L.. -L../lib
++LIBS := -L. -L.. -L../lib ${COMPILER_RPATH_FLAG}$(LIBDIR)
+ LIBS += $(LDFLAGS_libxenctrl)
+ LIBS += $(LDFLAGS_libxenstore)
+ LIBS += -lpthread -lrt