diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-12-17 13:39:59 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-12-17 13:39:59 +0000 |
| commit | 5b43ae37172e34af09620e8b55e0b3d91b7bd312 (patch) | |
| tree | e3922460911a4efdc74d983a4f90c1f51656e7cd /devel | |
| parent | 75b3a26912425885d31afcb4df986ee4ded304d1 (diff) | |
| download | pkgsrc-5b43ae37172e34af09620e8b55e0b3d91b7bd312.tar.gz | |
Fix build under GCC 4.5.3 (NetBSD 6)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/nss/Makefile | 6 | ||||
| -rw-r--r-- | devel/nss/distinfo | 3 | ||||
| -rw-r--r-- | devel/nss/patches/patch-nss_coreconf_command.mk | 15 |
3 files changed, 22 insertions, 2 deletions
diff --git a/devel/nss/Makefile b/devel/nss/Makefile index f510ba8c8b8..92f668edeec 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2015/11/20 18:54:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.105 2015/12/17 13:39:59 ryoon Exp $ DISTNAME= nss-${NSS_RELEASE:S/.0$//} NSS_RELEASE= 3.21.0 @@ -57,6 +57,10 @@ MAKE_ENV+= INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr MAKE_ENV+= NSS_USE_SYSTEM_SQLITE=1 MAKE_ENV+= EXTRA_SHARED_LIBS="-Wl,-R${BUILDLINK_PREFIX.nspr}/lib/nspr -Wl,-R,${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4" MAKE_ENV+= NSS_DISABLE_GTESTS=yes +.include "../../mk/compiler.mk" +.if !empty(CC_VERSION:Mgcc-4.[0-7]*) +CFLAGS+= -DNSS_NO_GCC48 +.endif post-extract: find ${WRKSRC} -type f | xargs ${CHMOD} 644 diff --git a/devel/nss/distinfo b/devel/nss/distinfo index 7e1ff69fe54..79497b05d15 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2015/11/20 18:54:50 ryoon Exp $ +$NetBSD: distinfo,v 1.54 2015/12/17 13:39:59 ryoon Exp $ SHA1 (nss-3.21.tar.gz) = d4bbbd72b967443e8b65f504cdd157e3df93a84a RMD160 (nss-3.21.tar.gz) = f0bbfcfcfc46274ccad4b1ec2fdf63db1eb05681 @@ -15,5 +15,6 @@ SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4 SHA1 (patch-nss_cmd_platlibs.mk) = 7dadcb72acf15714c61ae74b21c5baf45bc51d4c SHA1 (patch-nss_coreconf_OpenBSD.mk) = fa545c993038e99bf9f59b59ec1d0bd1f6c192a9 +SHA1 (patch-nss_coreconf_command.mk) = 007b7adb79d300ae73ee4cd71b7314c665172e31 SHA1 (patch-nss_lib_freebl_config.mk) = 1c198177da8ba7928cbfbd23e385503be99ebe27 SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af diff --git a/devel/nss/patches/patch-nss_coreconf_command.mk b/devel/nss/patches/patch-nss_coreconf_command.mk new file mode 100644 index 00000000000..8f966c7fb14 --- /dev/null +++ b/devel/nss/patches/patch-nss_coreconf_command.mk @@ -0,0 +1,15 @@ +$NetBSD: patch-nss_coreconf_command.mk,v 1.1 2015/12/17 13:39:59 ryoon Exp $ + +* Pass CFLAGS from pkgsrc + +--- nss/coreconf/command.mk.orig 2015-11-09 05:12:59.000000000 +0000 ++++ nss/coreconf/command.mk +@@ -12,7 +12,7 @@ AS = $(CC) + ASFLAGS += $(CFLAGS) + CCF = $(CC) $(CFLAGS) + LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS) +-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ ++CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ + $(XCFLAGS) + PERL = perl + RANLIB = echo |