diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-10-09 12:10:02 +0000 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-10-09 12:10:02 +0000 |
| commit | 4f019a52672f513b8a0fed0ca76a586964ea5878 (patch) | |
| tree | fedaedc28676986b730a2a891c51409a466b2d72 /security/nss/files | |
| parent | a5dec5ea0b27cbaa85090a9cdca12a69a934a32f (diff) | |
| download | FreeBSD-ports-4f019a52672f513b8a0fed0ca76a586964ea5878.zip FreeBSD-ports-4f019a52672f513b8a0fed0ca76a586964ea5878.tar.gz | |
devel/nspr, security/nss: drop version from SONAME
No other downstream appends synthetic library version, and doing so
causes underlinking due to fragile build system (see below). Not to
mention being unable to swap out bundled libs from upstream builds.
$ cc -lplds4 -L/usr/local/lib
/usr/lib/crt1.o: In function `_start1':
crt1_c.c:(.text+0xa6): undefined reference to `main'
/usr/local/lib/libplds4.so: undefined reference to `pthread_set_name_np'
/usr/local/lib/libplds4.so: undefined reference to `pthread_create'
/usr/local/lib/libplds4.so: undefined reference to `pthread_condattr_init'
/usr/local/lib/libplds4.so: undefined reference to `pthread_setschedparam'
/usr/local/lib/libplds4.so: undefined reference to `pthread_getschedparam'
PR: 213144
Exp-run by: antoine
Diffstat (limited to 'security/nss/files')
| -rw-r--r-- | security/nss/files/patch-coreconf_FreeBSD.mk | 21 | ||||
| -rw-r--r-- | security/nss/files/patch-coreconf_rules.mk | 12 |
2 files changed, 6 insertions, 27 deletions
diff --git a/security/nss/files/patch-coreconf_FreeBSD.mk b/security/nss/files/patch-coreconf_FreeBSD.mk index f77bd7e7..2cbc8d9 100644 --- a/security/nss/files/patch-coreconf_FreeBSD.mk +++ b/security/nss/files/patch-coreconf_FreeBSD.mk @@ -30,25 +30,16 @@ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -70,15 +85,15 @@ - - ARCH = freebsd - --MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) -+ifndef MOZILLA_CLIENT -+DLL_SUFFIX = so.1 -+endif +@@ -46,7 +56,11 @@ else + DLL_SUFFIX = so.1.0 + endif --ifeq ($(MOZ_OBJFORMAT),elf) --DLL_SUFFIX = so +-MKSHLIB = $(CC) $(DSO_LDOPTS) +ifneq (,$(filter alpha ia64,$(OS_TEST))) +MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) - else --DLL_SUFFIX = so.1.0 ++else +MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) - endif -- --MKSHLIB = $(CC) $(DSO_LDOPTS) ++endif ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif diff --git a/security/nss/files/patch-coreconf_rules.mk b/security/nss/files/patch-coreconf_rules.mk deleted file mode 100644 index 22fb9a3..0000000 --- a/security/nss/files/patch-coreconf_rules.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- coreconf/rules.mk.orig Sat Jan 6 00:48:54 2007 -+++ coreconf/rules.mk Fri Mar 23 10:15:46 2007 -@@ -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) |
