diff options
Diffstat (limited to 'www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk')
-rw-r--r-- | www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk b/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk index 279110fa0321..b1ea1eb209c0 100644 --- a/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk +++ b/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk @@ -1,6 +1,6 @@ --- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 +++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,20 @@ +@@ -49,8 +49,24 @@ ifeq ($(CPU_ARCH),pc98) CPU_ARCH = x86 endif @@ -9,12 +9,16 @@ +ifeq ($(OS_TEST),alpha) +CPU_ARCH = alpha +endif -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 ++ifeq ($(OS_TEST),x86_64) ++CPU_ARCH = x86_64 +endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 +endif ++ifeq ($(OS_TEST),powerpc64) ++CPU_ARCH = powerpc ++USE_64 = 1 ++endif +ifeq ($(OS_TEST),powerpc) +CPU_ARCH = powerpc +endif @@ -32,9 +36,11 @@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -@@ -87,4 +99,4 @@ +@@ -87,4 +99,6 @@ G++INCLUDES = -I/usr/include/g++ -INCLUDES += -I/usr/X11R6/include -+#INCLUDES += -I/usr/local/include ++USE_SYSTEM_ZLIB = 1 ++ZLIB_LIBS = -lz ++INCLUDES += -I$(LOCALBASE)/include |