sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use -Bsymbolic when linking nss to avoid symbol conflicts with libraries

Browse source 
that include OpenSSL (e.g. CUPS).  This may help alleviate the problem with
Firefox crashing when trying to print when using CUPS.
This commit is contained in:
Joe Marcus Clarke 2004-11-22 04:04:52 +00:00
parent c4a389c505
commit 43baba8dc1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=122115
18 changed files with 180 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/firefox-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/firefox-devel/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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

2
www/firefox-esr/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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

2
www/firefox/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/firefox/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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

2
www/firefox10/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/firefox10/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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

2
www/firefox15/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/firefox15/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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

2
www/firefox3-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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

2
www/firefox35/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/firefox35/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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

2
www/firefox36/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/firefox36/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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

2
www/flock/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 1.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}

24
www/flock/files/patch-security-coreconf-FreeBSD.mk
View file

@ -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