Date: Wed, 6 Jul 2011 23:07:23 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r586 - in branches/experimental/www/firefox-aurora: . files Message-ID: <201107062307.p66N7Nnr076081@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Wed Jul 6 23:07:23 2011 New Revision: 586 Log: - update to 7.0a2 snapshot of today To use this you need bsg.gecko.mk from branches/experimental/Mk Modified: branches/experimental/www/firefox-aurora/Makefile branches/experimental/www/firefox-aurora/distinfo branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in Modified: branches/experimental/www/firefox-aurora/Makefile ============================================================================== --- branches/experimental/www/firefox-aurora/Makefile Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/Makefile Wed Jul 6 23:07:23 2011 (r586) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 6.0a2-20110616 +DISTVERSION= 7.0a2-20110706 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://tb.smeets.im/~flo/ \ @@ -58,7 +58,7 @@ .include <bsd.port.pre.mk> -WRKSRC:= ${WRKDIR}/firefox-6.0a2 +WRKSRC:= ${WRKDIR}/firefox-7.0a2 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} Modified: branches/experimental/www/firefox-aurora/distinfo ============================================================================== --- branches/experimental/www/firefox-aurora/distinfo Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/distinfo Wed Jul 6 23:07:23 2011 (r586) @@ -1,2 +1,2 @@ -SHA256 (firefox-6.0a2-20110616.source.tar.bz2) = ed3ea8f82775ae9c13857db61f1d634c580c45d3a9003302187c7b25462382ea -SIZE (firefox-6.0a2-20110616.source.tar.bz2) = 67409190 +SHA256 (firefox-7.0a2-20110706.source.tar.bz2) = f4f40dc69dfa213310d9e8922282e640bbc03aba19fad8ef136d58f6fe4bb04c +SIZE (firefox-7.0a2-20110706.source.tar.bz2) = 69516972 Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in Wed Jul 6 23:07:23 2011 (r586) @@ -1,24 +1,24 @@ ---- js/src/Makefile.in.orig 2011-06-01 00:33:48.000000000 +0200 -+++ js/src/Makefile.in 2011-06-02 01:36:58.745440491 +0200 +--- 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 amd64 arm% sparc %86 x86_64,$(TARGET_CPU))) ++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU))) VPATH += $(srcdir)/assembler \ $(srcdir)/assembler/wtf \ -@@ -470,6 +470,9 @@ +@@ -469,6 +469,9 @@ + else #CPPSRCS += only_on_x86.cpp endif - endif +ifeq (amd64, $(TARGET_CPU)) +#CPPSRCS += only_on_x86_64.cpp +endif + endif ifeq (arm, $(TARGET_CPU)) #CPPSRCS += only_on_arm.cpp - endif @@ -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 Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in Wed Jul 6 23:07:23 2011 (r586) @@ -1,5 +1,14 @@ ---- js/src/configure.in.orig 2011-06-01 00:33:48.000000000 +0200 -+++ js/src/configure.in 2011-06-01 09:12:10.225441827 +0200 +--- js/src/configure.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ js/src/configure.in 2011-07-06 22:19:17.584233430 +0200 +@@ -1473,7 +1473,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + @@ -1495,7 +1495,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= @@ -14,70 +23,50 @@ AC_DEFINE(JS_NUNBOX32) ;; -x86_64*-*) -+x86_64*-*|amd64*-*) ++amd64*-*) ENABLE_TRACEJIT=1 NANOJIT_ARCH=X64 ENABLE_METHODJIT=1 -@@ -2732,16 +2732,6 @@ - AC_DEFINE(JS_CPU_ARM) - AC_DEFINE(JS_NUNBOX32) +@@ -2723,23 +2723,23 @@ + AC_DEFINE(JS_CPU_X64) + AC_DEFINE(JS_PUNBOX64) + ;; +-arm*-*) ++x86_64*-*) + ENABLE_TRACEJIT=1 +- NANOJIT_ARCH=ARM ++ NANOJIT_ARCH=X64 + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 +- AC_DEFINE(JS_CPU_ARM) +- AC_DEFINE(JS_NUNBOX32) ++ ENABLE_POLYIC_TYPED_ARRAY=1 ++ AC_DEFINE(JS_CPU_X64) ++ AC_DEFINE(JS_PUNBOX64) ;; -sparc*-*) -- ENABLE_TRACEJIT=1 ++arm*-*) + ENABLE_TRACEJIT=1 - NANOJIT_ARCH=Sparc -- ENABLE_METHODJIT=1 -- ENABLE_MONOIC=1 -- ENABLE_POLYIC=1 ++ NANOJIT_ARCH=ARM + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 - ENABLE_POLYIC_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) -- AC_DEFINE(JS_NUNBOX32) -- ;; ++ AC_DEFINE(JS_CPU_ARM) + AC_DEFINE(JS_NUNBOX32) + ;; esac - - MOZ_ARG_DISABLE_BOOL(methodjit, -@@ -2796,7 +2786,7 @@ +@@ -2796,6 +2796,10 @@ i?86-*) AC_DEFINE(AVMPLUS_IA32) ;; --x86_64*-*) -+x86_64*-*|amd64*-*) ++amd64*-*) ++ AC_DEFINE(AVMPLUS_AMD64) ++ AC_DEFINE(AVMPLUS_64BIT) ++ ;; + x86_64*-*) AC_DEFINE(AVMPLUS_AMD64) AC_DEFINE(AVMPLUS_64BIT) - ;; -@@ -3367,11 +3357,11 @@ - ;; - *) - MOZ_CHECK_PTHREADS(pthreads, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads", - MOZ_CHECK_PTHREADS(pthread, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", - MOZ_CHECK_PTHREADS(c_r, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", - MOZ_CHECK_PTHREADS(c, - USE_PTHREADS=1 - ) -@@ -3446,18 +3436,18 @@ - *-*-freebsd*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) -- dnl -pthread links in -lc_r, so don't specify it explicitly. -+ dnl -pthread links in -pthread, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - else -- _PTHREAD_LDFLAGS="-lc_r" -+ _PTHREAD_LDFLAGS="-pthread" - fi - ;; - - *-*-openbsd*|*-*-bsdi*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) -- dnl -pthread links in -lc_r, so don't specify it explicitly. -+ dnl -pthread links in -pthread, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - fi Modified: branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in Wed Jul 6 23:07:23 2011 (r586) @@ -1,5 +1,5 @@ ---- layout/generic/Makefile.in.orig 2011-06-01 00:34:33.000000000 +0200 -+++ layout/generic/Makefile.in 2011-06-01 00:59:40.612442830 +0200 +--- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200 ++++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200 @@ -159,9 +159,10 @@ -I$(srcdir)/../../content/html/content/src \ -I$(srcdir)/../../dom/base \ @@ -7,7 +7,7 @@ - $(MOZ_CAIRO_CFLAGS) \ $(NULL) -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) ++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) + ifdef MOZ_ENABLE_GTK2 CXXFLAGS += $(MOZ_GTK2_CFLAGS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107062307.p66N7Nnr076081>