diff options
| author | richard <richard> | 2015-09-25 08:43:03 +0000 |
|---|---|---|
| committer | richard <richard> | 2015-09-25 08:43:03 +0000 |
| commit | 041a315f5849919fe58a66698c24c08261c6026b (patch) | |
| tree | 2424786ec1c9dbef98ce96f2c29b477bf12a5402 | |
| parent | 3fcc66b994742adc69819cb9ed4ea489cf5b3690 (diff) | |
| download | pkgsrc-041a315f5849919fe58a66698c24c08261c6026b.tar.gz | |
missing perl possible -fstack-protector* options plus patch to get MAKE_JOBS_SAFE
working again as referenced https://bugs.gentoo.org/show_bug.cgi?id=388607
| -rw-r--r-- | devel/p5-subversion/Makefile | 9 | ||||
| -rw-r--r-- | devel/subversion/distinfo | 4 | ||||
| -rw-r--r-- | devel/subversion/patches/patch-ad | 11 |
3 files changed, 17 insertions, 7 deletions
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index 1d1325bc249..3dc0c435fa0 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2015/08/13 20:47:42 adam Exp $ +# $NetBSD: Makefile,v 1.86 2015/09/25 08:43:03 richard Exp $ PKGNAME= p5-subversion-${SVNVER} COMMENT= Perl bindings for Subversion @@ -12,13 +12,16 @@ PERL5_CONFIGURE= no PERL5_OPTIONS+= threads PERL5_PACKLIST= auto/SVN/_Core/.packlist -MAKE_JOBS_SAFE= no # https://bugs.gentoo.org/show_bug.cgi?id=388607 - BUILD_TARGET= swig-pl INSTALL_TARGET= install-swig-pl TEST_TARGET= check-swig-pl MAKE_ENV+= SUBVERSION_BASE_PREFIX=${BUILDLINK_PREFIX.subversion-base} +PERL_LDOPTS!= perl -MExtUtils::Embed -e ldopts +.if !empty(PERL_LDOPTS:M-fstack-protector*) +LDFLAGS.SunOS+= ${PERL_LDOPTS:M-fstack-protector*} +.endif + post-patch: ${RM} ${WRKSRC}/build-outputs.mk ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo index 2d31d61d45d..a6784ea226e 100644 --- a/devel/subversion/distinfo +++ b/devel/subversion/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.97 2015/09/05 14:10:59 adam Exp $ +$NetBSD: distinfo,v 1.98 2015/09/25 08:43:04 richard Exp $ SHA1 (subversion-1.9.1.tar.bz2) = 1244a741dbcf24f2b1d165225f0159a0c994e37a RMD160 (subversion-1.9.1.tar.bz2) = 7f514b2d2338d1bdb7cca056709311e26929ae15 Size (subversion-1.9.1.tar.bz2) = 7747098 bytes -SHA1 (patch-ad) = 27c13ae7564e2c4974cf0084acd4bd7582b894b0 +SHA1 (patch-ad) = 5a11156f0af26e1dff64ddb247fee94b1e67dd9a SHA1 (patch-ae) = a9cd7d26fb5f9da8ff81413ef32948ccd6c4290e SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad index 19d62bbc553..58ad23ce6f9 100644 --- a/devel/subversion/patches/patch-ad +++ b/devel/subversion/patches/patch-ad @@ -1,4 +1,6 @@ -$NetBSD: patch-ad,v 1.16 2015/08/13 20:47:42 adam Exp $ +$NetBSD: patch-ad,v 1.17 2015/09/25 08:43:04 richard Exp $ + +apply https://bugs.gentoo.org/show_bug.cgi?id=388607 for MAKE_JOBS_SAFE=yes --- Makefile.in.orig 2015-07-26 23:03:10.000000000 +0000 +++ Makefile.in @@ -11,7 +13,12 @@ $NetBSD: patch-ad,v 1.16 2015/08/13 20:47:42 adam Exp $ javahl_javadir = @libdir@/svn-javahl javahl_javahdir = @libdir@/svn-javahl/include -@@ -837,7 +837,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI +@@ -833,11 +833,11 @@ clean-swig-headers: + extraclean-swig-headers: clean-swig-headers + $(EXTRACLEAN_SWIG_HEADERS) + +-$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in ++$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL |