diff options
Diffstat (limited to 'devel/nspr')
| -rw-r--r-- | devel/nspr/Makefile | 7 | ||||
| -rw-r--r-- | devel/nspr/distinfo | 4 | ||||
| -rw-r--r-- | devel/nspr/files/patch-..::configure | 28 | ||||
| -rw-r--r-- | devel/nspr/files/patch-.._pr_tests_Makefile | 11 | ||||
| -rw-r--r-- | devel/nspr/files/patch-bug782815 | 11 |
5 files changed, 40 insertions, 21 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index f9fd1c569710..66de14202aac 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -6,7 +6,7 @@ # $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $ PORTNAME= nspr -DISTVERSION= 4.9.4 +DISTVERSION= 4.9.5 CATEGORIES= devel MASTER_SITES= MOZILLA MASTER_SITE_SUBDIR= nspr/releases/v${PORTVERSION}/src @@ -23,6 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure CONFIGURE_ARGS= --srcdir=${WRKSRC:H} \ --with-pthreads +CONFIGURE_ENV= BSD_PTHREAD_LIBS=${PTHREAD_LIBS} MAKE_ENV= DIST=${WRKSRC}/dist @@ -39,7 +40,7 @@ CONFIGURE_ARGS+=--disable-debug .endif post-patch: - @${REINPLACE_CMD} -e 's,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: ${MKDIR} ${PREFIX}/include/nspr @@ -63,7 +64,7 @@ do-install: .endfor prtests: - ${GMAKE} -C ${WRKSRC}/pr/tests + ${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests ${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo index 7bf47a6848a5..44cd26314e2e 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -1,2 +1,2 @@ -SHA256 (nspr-4.9.4.tar.gz) = 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 -SIZE (nspr-4.9.4.tar.gz) = 1160641 +SHA256 (nspr-4.9.5.tar.gz) = 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604 +SIZE (nspr-4.9.5.tar.gz) = 1156396 diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure index 0698262753b5..8d5d0ffebde9 100644 --- a/devel/nspr/files/patch-..::configure +++ b/devel/nspr/files/patch-..::configure @@ -1,11 +1,29 @@ --- ../configure.orig 2012-02-14 20:06:00.000000000 +0100 +++ ../configure 2012-02-17 17:14:27.862323726 +0100 -@@ -4062,7 +4062,7 @@ +@@ -4035,11 +4035,8 @@ EOF + EOF + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" - MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - if test "$MOZ_OBJFORMAT" = "elf"; then +- MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` +- if test "$MOZ_OBJFORMAT" = "elf"; then - DLL_SUFFIX=so +- else +- DLL_SUFFIX=so.1.0 ++ if test -z "$MOZILLA_CLIENT"; then + DLL_SUFFIX=so.1 - else - DLL_SUFFIX=so.1.0 fi + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +@@ -6271,11 +6271,6 @@ + #define _THREAD_SAFE 1 + EOF + +- if test "$ac_cv_have_dash_pthread" = "yes"; then +- _PTHREAD_LDFLAGS="-pthread" +- else +- _PTHREAD_LDFLAGS="-lc_r" +- fi + ;; + *-netbsd*) + if test "$ac_cv_have_dash_pthread" = "yes"; then + diff --git a/devel/nspr/files/patch-.._pr_tests_Makefile b/devel/nspr/files/patch-.._pr_tests_Makefile new file mode 100644 index 000000000000..af796164c9ea --- /dev/null +++ b/devel/nspr/files/patch-.._pr_tests_Makefile @@ -0,0 +1,11 @@ +--- ../../nsprpub/pr/tests/Makefile.in.orig Mon Apr 26 00:01:02 2004 ++++ ../../nsprpub/pr/tests/Makefile.in Tue Nov 28 11:08:14 2006 +@@ -418,7 +418,7 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifeq ($(USE_PTHREADS),1) +-LDOPTS += -pthread ++LDOPTS += ${PTHREAD_LIBS} + endif + LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR) + endif diff --git a/devel/nspr/files/patch-bug782815 b/devel/nspr/files/patch-bug782815 deleted file mode 100644 index cb04122833ce..000000000000 --- a/devel/nspr/files/patch-bug782815 +++ /dev/null @@ -1,11 +0,0 @@ ---- ../pr/src/pthreads/ptio.c~ -+++ ../pr/src/pthreads/ptio.c -@@ -1150,7 +1150,7 @@ void _PR_InitIO(void) - osfd = socket(AF_INET6, SOCK_STREAM, 0); - if (osfd != -1) { - int on; -- int optlen = sizeof(on); -+ socklen_t optlen = sizeof(on); - if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, - &on, &optlen) == 0) { - _pr_ipv6_v6only_on_by_default = on; |