diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2011-08-16 18:14:40 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2011-08-16 18:14:40 +0000 |
| commit | fd1d2254fa2bb9d1ad95595343976d08110add20 (patch) | |
| tree | 1542b23101aada54a586adef2535b9449614115f /www/firefox-esr/files/patch-js-src-Makefile.in | |
| parent | - add support for seamonkey 2.3, firefox and thunderbird 6 (diff) | |
- update to 6.0
- misc cleanups [1] [2]
Security: http://www.vuxml.org/freebsd/834591a9-c82f-11e0-897d-6c626dd55a41.html
PR: ports/159709 [1]
ports/158702 [2]
Submitted by: Ruslan Mahmatkhanov <cvs-src@yandex.ru> [1]
Pan Tsu <inyaoo@gmail.com> [2]
Notes
Notes:
svn path=/head/; revision=279829
Diffstat (limited to 'www/firefox-esr/files/patch-js-src-Makefile.in')
| -rw-r--r-- | www/firefox-esr/files/patch-js-src-Makefile.in | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/www/firefox-esr/files/patch-js-src-Makefile.in b/www/firefox-esr/files/patch-js-src-Makefile.in index 1657c655d8c9..2aa090fc3b57 100644 --- a/www/firefox-esr/files/patch-js-src-Makefile.in +++ b/www/firefox-esr/files/patch-js-src-Makefile.in @@ -1,6 +1,25 @@ ---- js/src/Makefile.in.orig 2011-03-17 18:51:39.000000000 +0100 -+++ js/src/Makefile.in 2011-03-18 19:41:09.000000000 +0100 -@@ -612,7 +612,7 @@ +--- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 +@@ -416,7 +416,7 @@ + # END enclude sources for V8 dtoa + ############################################# + +-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) ++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU))) + + VPATH += $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ +@@ -469,6 +469,9 @@ + else + #CPPSRCS += only_on_x86.cpp + endif ++ifeq (amd64, $(TARGET_CPU)) ++#CPPSRCS += only_on_x86_64.cpp ++endif + endif + ifeq (arm, $(TARGET_CPU)) + #CPPSRCS += only_on_arm.cpp +@@ -739,7 +742,7 @@ # to reliably get limit macros defined, we'd always have to define the # one below before including any header, but that's obscure and # fragile, so we do it here. @@ -9,13 +28,14 @@ INCLUDES += -I$(srcdir) -@@ -666,7 +666,8 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+DEFINES += -DFREEBSD -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 + +-@@ -793,7 +796,8 @@ ++@@ -793,7 +796,7 @@ + endif # WINNT + + ifeq ($(OS_ARCH),FreeBSD) + -EXTRA_LIBS += -pthread +-+DEFINES += -DFREEBSD + +EXTRA_LIBS += -pthread -lc + endif + ifeq ($(OS_ARCH),IRIX) |