CVS commit: pkgsrc/devel/nspr

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Sun Aug 28 07:00:50 UTC 2016

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

Log Message:
add runpath to Linux caught during check-shlibs-elf
fixes build on aarch64-linux-gnu


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/nspr/distinfo
cvs rdiff -u -r1.10 -r1.11 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/distinfo
diff -u pkgsrc/devel/nspr/distinfo:1.39 pkgsrc/devel/nspr/distinfo:1.40
--- pkgsrc/devel/nspr/distinfo:1.39     Wed Feb 17 21:58:26 2016
+++ pkgsrc/devel/nspr/distinfo  Sun Aug 28 07:00:50 2016
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.39 2016/02/17 21:58:26 ryoon Exp $
+$NetBSD: distinfo,v 1.40 2016/08/28 07:00:50 richard Exp $
 
 SHA1 (nspr-4.12.tar.gz) = 14fb67a0e686a5c662f92e7f59dfd10053f327dd
 RMD160 (nspr-4.12.tar.gz) = 15e97641f2babe0b0e84ef588001ae0c2d9a3465
 SHA512 (nspr-4.12.tar.gz) = 138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460
 Size (nspr-4.12.tar.gz) = 1135458 bytes
 SHA1 (patch-ab) = d93c055bbb12bd9edf5f21138a93898d6b3b3c73
-SHA1 (patch-ac) = 7c6ee805c52a73ab810c489d626f82282fe557d5
+SHA1 (patch-ac) = 543f0e899f7c1d7e8b7c63db76a6492e68b1a585
 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.10 pkgsrc/devel/nspr/patches/patch-ac:1.11
--- pkgsrc/devel/nspr/patches/patch-ac:1.10     Thu Aug 20 10:53:13 2015
+++ pkgsrc/devel/nspr/patches/patch-ac  Sun Aug 28 07:00:50 2016
@@ -1,6 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2015/08/20 10:53:13 ryoon Exp $
+$NetBSD: patch-ac,v 1.11 2016/08/28 07:00:50 richard Exp $
 
---- nspr/configure.in.orig     2015-08-19 15:32:22.000000000 +0000
+add runpath to Linux caught during check-shlibs-elf
+
+--- nspr/configure.in.orig     2016-02-12 13:51:25.000000000 +0000
 +++ nspr/configure.in
 @@ -38,7 +38,7 @@ OBJDIR_NAME=.
  OBJDIR_SUFFIX=OBJ
@@ -45,7 +47,17 @@ $NetBSD: patch-ac,v 1.10 2015/08/20 10:5
      ;;
  
  *-hpux*)
-@@ -2132,7 +2159,7 @@ tools are selected during the Xcode/Deve
+@@ -1805,6 +1832,9 @@ tools are selected during the Xcode/Deve
+     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+     DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
++    if test "$LIBRUNPATH"; then
++        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
++    fi
+     _OPTIMIZE_FLAGS=-O2
+     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
+                                    # combo is not yet good at debugging inlined
+@@ -2128,7 +2158,7 @@ tools are selected during the Xcode/Deve
      AC_DEFINE(HAVE_SOCKLEN_T)
      CFLAGS="$CFLAGS -ansi -Wall"
      CXXFLAGS="$CXXFLAGS -ansi -Wall"
@@ -54,7 +66,7 @@ $NetBSD: patch-ac,v 1.10 2015/08/20 10:5
      DSO_CFLAGS=-fPIC
      MDCPUCFG_H=_openbsd.cfg
      PR_MD_CSRCS=openbsd.c
-@@ -2718,7 +2745,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2715,7 +2745,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
                case "$target_os" in
@@ -63,7 +75,7 @@ $NetBSD: patch-ac,v 1.10 2015/08/20 10:5
  # Freebsd doesn't use -pthread for compiles, it uses them for linking
              ;;
            *)
-@@ -2756,7 +2783,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2753,7 +2783,7 @@ if test -n "$USE_PTHREADS"; then
              _PTHREAD_LDFLAGS=
          fi
            ;;
@@ -72,7 +84,7 @@ $NetBSD: patch-ac,v 1.10 2015/08/20 10:5
            AC_DEFINE(_REENTRANT)
            AC_DEFINE(_THREAD_SAFE)
            dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2837,7 +2864,7 @@ case "$target" in
+@@ -2834,7 +2864,7 @@ case "$target" in
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;