kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/www/firefox10/files/patch-security-coreconf-FreeBSD.mk

29 lines
702 B
Makefile
Raw Normal View History

Use -Bsymbolic when linking nss to avoid symbol conflicts with libraries that include OpenSSL (e.g. CUPS). This may help alleviate the problem with Firefox crashing when trying to print when using CUPS.
2004-11-22 05:04:52 +01:00
--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003
+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004
@@ -43,8 +43,12 @@
ifeq ($(OS_TEST),alpha)
Port to amd64 (note: needs ld-elf.so.1 bugfix to actually work) I've taken a chance and split the sparc64 and alpha mega-diffs up because sparc64 patched the result of alpha's patches, and amd64 needed to do the same again - but it was sorted lexically before alpha/sparc64. I've grouped the xptcall patches together since they are standalone and split up and merged the other infrastructure jumbo-patches. I also attempted to sync up the nspr vs firebird diffs for sparc64 and alpha because they disagreed. HOWEVER... While this port 'depends' on the nspr port, it doesn't actually *use* it. It should probably be removed from the LIB_DEPENDS list. Note that the amd64 xptcall code came from SuSE via the mozilla bugzilla database.
2003-12-13 22:35:43 +01:00
CPU_ARCH = alpha
else
+ifeq ($(OS_TEST),amd64)
+CPU_ARCH = amd64
+else
CPU_ARCH = x86
Use -Bsymbolic when linking nss to avoid symbol conflicts with libraries that include OpenSSL (e.g. CUPS). This may help alleviate the problem with Firefox crashing when trying to print when using CUPS.
2004-11-22 05:04:52 +01:00
endif
Port to amd64 (note: needs ld-elf.so.1 bugfix to actually work) I've taken a chance and split the sparc64 and alpha mega-diffs up because sparc64 patched the result of alpha's patches, and amd64 needed to do the same again - but it was sorted lexically before alpha/sparc64. I've grouped the xptcall patches together since they are standalone and split up and merged the other infrastructure jumbo-patches. I also attempted to sync up the nspr vs firebird diffs for sparc64 and alpha because they disagreed. HOWEVER... While this port 'depends' on the nspr port, it doesn't actually *use* it. It should probably be removed from the LIB_DEPENDS list. Note that the amd64 xptcall code came from SuSE via the mozilla bugzilla database.
2003-12-13 22:35:43 +01:00
+endif
Use -Bsymbolic when linking nss to avoid symbol conflicts with libraries that include OpenSSL (e.g. CUPS). This may help alleviate the problem with Firefox crashing when trying to print when using CUPS.
2004-11-22 05:04:52 +01:00
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
@@ -71,7 +75,11 @@
DLL_SUFFIX = so.1.0
Port to amd64 (note: needs ld-elf.so.1 bugfix to actually work) I've taken a chance and split the sparc64 and alpha mega-diffs up because sparc64 patched the result of alpha's patches, and amd64 needed to do the same again - but it was sorted lexically before alpha/sparc64. I've grouped the xptcall patches together since they are standalone and split up and merged the other infrastructure jumbo-patches. I also attempted to sync up the nspr vs firebird diffs for sparc64 and alpha because they disagreed. HOWEVER... While this port 'depends' on the nspr port, it doesn't actually *use* it. It should probably be removed from the LIB_DEPENDS list. Note that the amd64 xptcall code came from SuSE via the mozilla bugzilla database.
2003-12-13 22:35:43 +01:00
endif
Use -Bsymbolic when linking nss to avoid symbol conflicts with libraries that include OpenSSL (e.g. CUPS). This may help alleviate the problem with Firefox crashing when trying to print when using CUPS.
2004-11-22 05:04:52 +01:00
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+else
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
+endif
ifdef MAPFILE
# Add LD options to restrict exported symbols to those in the map file
endif
Reference in a new issue Copy permalink