diff options
author | ryoon <ryoon@pkgsrc.org> | 2013-11-02 12:34:14 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2013-11-02 12:34:14 +0000 |
commit | 47dfcb4382bd4d106c49745b34707d846c2a395e (patch) | |
tree | 217141cae4f179a86e6548ce9146e8dd8a099e6f /devel/nspr | |
parent | f83fb93733a8235da8a34df46cdff959266fd725 (diff) | |
download | pkgsrc-47dfcb4382bd4d106c49745b34707d846c2a395e.tar.gz |
Fix build on OpenBSD 5.4
Diffstat (limited to 'devel/nspr')
-rw-r--r-- | devel/nspr/Makefile | 6 | ||||
-rw-r--r-- | devel/nspr/distinfo | 4 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ac | 23 |
3 files changed, 23 insertions, 10 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 249b3801a6e..312ec786f6f 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2013/10/12 13:46:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.65 2013/11/02 12:34:14 ryoon Exp $ # DISTNAME= nspr-${NSPR_RELEASE} @@ -35,6 +35,10 @@ SUBST_MESSAGE.nspr-config= Fixing nspr-config run path SUBST_FILES.nspr-config= nspr/config/nspr-config.in SUBST_SED.nspr-config= -e 's|-L$$libdir|"${COMPILER_RPATH_FLAG}$$libdir -L$$libdir"|g' +.if ${OPSYS} == "OpenBSD" +CHECK_SHLIBS_SUPPORTED= no +.endif + .if ${OPSYS} == "Darwin" SUBST_CLASSES+= exec_path SUBST_STAGE.exec_path= pre-configure diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo index 25cd095d6a4..48f0284a3c3 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.27 2013/10/12 13:46:51 ryoon Exp $ +$NetBSD: distinfo,v 1.28 2013/11/02 12:34:14 ryoon Exp $ SHA1 (nspr-4.10.1.tar.gz) = bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7 RMD160 (nspr-4.10.1.tar.gz) = 491fecc3a2485a9879a8dddbc4a7b94655555135 Size (nspr-4.10.1.tar.gz) = 1102858 bytes SHA1 (patch-ab) = d93c055bbb12bd9edf5f21138a93898d6b3b3c73 -SHA1 (patch-ac) = 128f721ad93a10b59c2be3c611d510da9dd64fa2 +SHA1 (patch-ac) = 9e25d47e8737355d8c242594329afed485bca44c SHA1 (patch-ae) = c6cf30927792140d867bb4dc3adf19786f6cdbe0 SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24 SHA1 (patch-az) = 9731da9565ae94b4e82bf66f6640e8e5e3a1744e diff --git a/devel/nspr/patches/patch-ac b/devel/nspr/patches/patch-ac index 8bc0d8e9b0e..9f44bee2fb7 100644 --- a/devel/nspr/patches/patch-ac +++ b/devel/nspr/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.8 2013/07/20 08:57:20 ryoon Exp $ +$NetBSD: patch-ac,v 1.9 2013/11/02 12:34:14 ryoon Exp $ ---- nsprpub/configure.in.orig 2012-05-31 22:48:19.000000000 +0000 +--- nspr/configure.in.orig 2013-09-18 23:49:51.000000000 +0000 +++ nspr/configure.in @@ -36,7 +36,7 @@ OBJDIR_NAME=. OBJDIR_SUFFIX=OBJ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2013/07/20 08:57:20 ryoon Exp $ LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' CYGWIN_WRAPPER= MACOS_SDK_DIR= -@@ -1519,6 +1519,33 @@ tools are selected during the Xcode/Deve +@@ -1538,6 +1538,33 @@ tools are selected during the Xcode/Deve DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c @@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.8 2013/07/20 08:57:20 ryoon Exp $ ;; *-hpux*) -@@ -2110,6 +2137,7 @@ mips-nec-sysv*) +@@ -2088,6 +2115,7 @@ tools are selected during the Xcode/Deve AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -53,7 +53,16 @@ $NetBSD: patch-ac,v 1.8 2013/07/20 08:57:20 ryoon Exp $ if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi -@@ -2918,7 +2946,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2138,7 +2166,7 @@ tools are selected during the Xcode/Deve + AC_DEFINE(HAVE_SOCKLEN_T) + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" +- DLL_SUFFIX=so.1.0 ++ DLL_SUFFIX=so + DSO_CFLAGS=-fPIC + MDCPUCFG_H=_openbsd.cfg + PR_MD_CSRCS=openbsd.c +@@ -2806,7 +2834,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 @@ -62,7 +71,7 @@ $NetBSD: patch-ac,v 1.8 2013/07/20 08:57:20 ryoon Exp $ # Freebsd doesn't use -pthread for compiles, it uses them for linking ;; *) -@@ -2956,7 +2984,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2844,7 +2872,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; @@ -71,7 +80,7 @@ $NetBSD: patch-ac,v 1.8 2013/07/20 08:57:20 ryoon Exp $ AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -3037,7 +3065,7 @@ case "$target" in +@@ -2925,7 +2953,7 @@ case "$target" in AC_DEFINE(_PR_NEED_PTHREAD_INIT) fi ;; |