diff options
| author | marcus <marcus@FreeBSD.org> | 2004-11-22 04:04:52 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-11-22 04:04:52 +0000 |
| commit | 923d8a6ec2413e75522da7bf04d230180e560ab1 (patch) | |
| tree | 0cf5a0a2a602da8b4c9ba5e705f3191905bebc64 /www/firefox | |
| parent | 68b98fa4c1dffd57fd6707d4b5a843173f9a7fb3 (diff) | |
| download | FreeBSD-ports-923d8a6ec2413e75522da7bf04d230180e560ab1.zip FreeBSD-ports-923d8a6ec2413e75522da7bf04d230180e560ab1.tar.gz | |
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.
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/Makefile | 2 | ||||
| -rw-r--r-- | www/firefox/files/patch-security-coreconf-FreeBSD.mk | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ec76e0e..4eb8574 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -7,7 +7,7 @@ PORTNAME= firefox PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} diff --git a/www/firefox/files/patch-security-coreconf-FreeBSD.mk b/www/firefox/files/patch-security-coreconf-FreeBSD.mk index 73292a7..3e0e14a 100644 --- a/www/firefox/files/patch-security-coreconf-FreeBSD.mk +++ b/www/firefox/files/patch-security-coreconf-FreeBSD.mk @@ -1,14 +1,28 @@ -$FreeBSD$ - ---- security/coreconf/FreeBSD.mk Thu Oct 16 23:03:47 2003 -+++ security/coreconf/FreeBSD.mk Thu Oct 16 22:53:11 2003 -@@ -44,5 +44,9 @@ +--- 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) CPU_ARCH = alpha else +ifeq ($(OS_TEST),amd64) +CPU_ARCH = amd64 +else CPU_ARCH = x86 + endif +endif + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + +@@ -71,7 +75,11 @@ + DLL_SUFFIX = so.1.0 endif +-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 |
