CVS commit: pkgsrc/devel/nspr

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Oct  4 12:52:43 UTC 2017

Modified Files:
        pkgsrc/devel/nspr: Makefile distinfo
        pkgsrc/devel/nspr/patches: patch-ac

Log Message:
nspr: Remove -zignore ld argument on SunOS.

It interferes with SSP support causing the dependency on libssp to be
dropped.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/devel/nspr/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/nspr/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/nspr/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nspr/Makefile
diff -u pkgsrc/devel/nspr/Makefile:1.92 pkgsrc/devel/nspr/Makefile:1.93
--- pkgsrc/devel/nspr/Makefile:1.92     Tue Sep 26 10:57:22 2017
+++ pkgsrc/devel/nspr/Makefile  Wed Oct  4 12:52:43 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2017/09/26 10:57:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.93 2017/10/04 12:52:43 jperkin Exp $
 
 DISTNAME=      nspr-${NSPR_RELEASE:S/.0$//}
+PKGREVISION=   1
 NSPR_RELEASE=  4.17.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}

Index: pkgsrc/devel/nspr/distinfo
diff -u pkgsrc/devel/nspr/distinfo:1.46 pkgsrc/devel/nspr/distinfo:1.47
--- pkgsrc/devel/nspr/distinfo:1.46     Tue Sep 26 10:57:22 2017
+++ pkgsrc/devel/nspr/distinfo  Wed Oct  4 12:52:43 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.46 2017/09/26 10:57:22 ryoon Exp $
+$NetBSD: distinfo,v 1.47 2017/10/04 12:52:43 jperkin Exp $
 
 SHA1 (nspr-4.17.tar.gz) = 5262abb243191d5fa3dcd72857d7d7f8ec47ad01
 RMD160 (nspr-4.17.tar.gz) = 9ab5741d361d8c381a08deb93c945e2bc4e5881c
 SHA512 (nspr-4.17.tar.gz) = 3589f533b88d7dbbdee078c2a836bf7f7cb48466cb8861b6a42b05f12a5c6ce49426aa8fb3b153d548acd1c9ccf0376feea5649b48e3d72f3da1af5df3bed882
 Size (nspr-4.17.tar.gz) = 1141300 bytes
 SHA1 (patch-ab) = d93c055bbb12bd9edf5f21138a93898d6b3b3c73
-SHA1 (patch-ac) = 9eecea602eb37dedb1675b9ae05061d81b924446
+SHA1 (patch-ac) = a3d2cef788393b84e833d9e33bdf40b10d8efbd0
 SHA1 (patch-ae) = c6cf30927792140d867bb4dc3adf19786f6cdbe0
 SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24
 SHA1 (patch-az) = 8961cde8e657176e9e18098ab8e8e4d59723ceca

Index: pkgsrc/devel/nspr/patches/patch-ac
diff -u pkgsrc/devel/nspr/patches/patch-ac:1.13 pkgsrc/devel/nspr/patches/patch-ac:1.14
--- pkgsrc/devel/nspr/patches/patch-ac:1.13     Tue Aug  1 12:10:48 2017
+++ pkgsrc/devel/nspr/patches/patch-ac  Wed Oct  4 12:52:43 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.13 2017/08/01 12:10:48 ryoon Exp $
+$NetBSD: patch-ac,v 1.14 2017/10/04 12:52:43 jperkin Exp $
 
 add runpath to Linux caught during check-shlibs-elf
 
@@ -66,6 +66,15 @@ add runpath to Linux caught during check
      DSO_CFLAGS=-fPIC
      MDCPUCFG_H=_openbsd.cfg
      PR_MD_CSRCS=openbsd.c
+@@ -2293,7 +2323,7 @@ tools are selected during the Xcode/Deve
+         if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
+             GCC_USE_GNU_LD=1
+         fi
+-        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
++        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs'
+         if test -n "$USE_B_DIRECT"; then
+             DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
+         fi
 @@ -2760,7 +2790,7 @@ if test -n "$USE_PTHREADS"; then
        if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
            ac_cv_have_dash_pthread=yes