Date: Tue, 29 Jan 2013 05:03:35 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1150 - in trunk: Mk devel/nspr/files security/nss/files Message-ID: <201301290503.r0T53ZPs070843@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Jan 29 05:03:35 2013
New Revision: 1150
Log:
simplify patching for bundled nspr/nss
Modified:
trunk/Mk/bsd.gecko.mk
trunk/devel/nspr/files/patch-..::configure
trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk
trunk/security/nss/files/patch-..::coreconf::rules.mk
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Tue Jan 29 02:57:34 2013 (r1149)
+++ trunk/Mk/bsd.gecko.mk Tue Jan 29 05:03:35 2013 (r1150)
@@ -851,18 +851,12 @@
@for i in ${.CURDIR}/../../devel/nspr/files/patch-*; do \
${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub/build < $$i; \
done
- @${REINPLACE_CMD} -e '/DLL_SUFFIX/s/so\.1$$/so/' \
- ${MOZSRC}/nsprpub/configure
.endif
.if ${USE_MOZILLA:M-nss}
@${ECHO_MSG} "===> Applying NSS patches"
@for i in ${.CURDIR}/../../security/nss/files/patch-*; do \
${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \
done
- @${REINPLACE_CMD} -e '/DLL_SUFFIX/d' \
- ${MOZSRC}/security/coreconf/FreeBSD.mk
- @${REINPLACE_CMD} -e '/\.so/d' \
- ${MOZSRC}/security/coreconf/rules.mk
.endif
.for subdir in "" nsprpub js/src
@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
Modified: trunk/devel/nspr/files/patch-..::configure
==============================================================================
--- trunk/devel/nspr/files/patch-..::configure Tue Jan 29 02:57:34 2013 (r1149)
+++ trunk/devel/nspr/files/patch-..::configure Tue Jan 29 05:03:35 2013 (r1150)
@@ -1,14 +1,19 @@
--- ../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
Modified: trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Tue Jan 29 02:57:34 2013 (r1149)
+++ trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Tue Jan 29 05:03:35 2013 (r1150)
@@ -27,7 +27,7 @@
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -65,20 +80,18 @@
+@@ -65,20 +80,20 @@
USE_PTHREADS = 1
DEFINES += -D_THREAD_SAFE -D_REENTRANT
OS_LIBS += -pthread
@@ -38,7 +38,9 @@
ARCH = freebsd
-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++ifndef MOZILLA_CLIENT
+DLL_SUFFIX = so.1
++endif
-ifeq ($(MOZ_OBJFORMAT),elf)
-DLL_SUFFIX = so
Modified: trunk/security/nss/files/patch-..::coreconf::rules.mk
==============================================================================
--- trunk/security/nss/files/patch-..::coreconf::rules.mk Tue Jan 29 02:57:34 2013 (r1149)
+++ trunk/security/nss/files/patch-..::coreconf::rules.mk Tue Jan 29 05:03:35 2013 (r1150)
@@ -1,10 +1,12 @@
--- ../coreconf/rules.mk.orig Sat Jan 6 00:48:54 2007
+++ ../coreconf/rules.mk Fri Mar 23 10:15:46 2007
-@@ -114,6 +114,7 @@
+@@ -114,6 +114,9 @@
endif
ifdef SHARED_LIBRARY
$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
++ifndef MOZILLA_CLIENT
+ ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so))
++endif
ifdef MOZ_DEBUG_SYMBOLS
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301290503.r0T53ZPs070843>