diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2011-03-22 15:24:49 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2011-03-22 15:24:49 +0000 |
| commit | d8add7cac467361c78bc446d5c0db8d385f18e56 (patch) | |
| tree | 9f3c0dfdef16328b5cca345328a05666b1760a59 /www/firefox-esr/files/patch-configure.in | |
| parent | - Connect www/firefox36 and www/firefox36-i18n to the build. (diff) | |
- Update to 4.0
- Add PGO option to enable Profile-Guided Optimization [1].
PR: ports/132231 [1] (based on)
Submitted by: lioux@ [1]
Thanks to: andreast@, Anonymous <swell.k AT gmail.com>, decke@, jsa@,
swills@ and all the testers for their feedback!
Diffstat (limited to 'www/firefox-esr/files/patch-configure.in')
| -rw-r--r-- | www/firefox-esr/files/patch-configure.in | 66 |
1 files changed, 63 insertions, 3 deletions
diff --git a/www/firefox-esr/files/patch-configure.in b/www/firefox-esr/files/patch-configure.in index 5ba21ea8bc53..d36a535358ab 100644 --- a/www/firefox-esr/files/patch-configure.in +++ b/www/firefox-esr/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2009-10-03 20:24:11.000000000 +0200 -+++ configure.in 2009-10-03 20:24:43.000000000 +0200 -@@ -1352,7 +1352,7 @@ +--- configure.in.orig 2010-11-04 21:05:18.000000000 +0100 ++++ configure.in 2010-11-09 12:59:28.000000000 +0100 +@@ -1549,7 +1549,7 @@ CPU_ARCH=sparc ;; @@ -9,3 +9,63 @@ CPU_ARCH="$OS_TEST" ;; +@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + +@@ -3803,19 +3803,21 @@ + AC_CHECK_FUNCS(localtime_r strtok_r) + + dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, ++_SAVE_LIBS=$LIBS ++AC_SEARCH_LIBS(clock_gettime, rt) ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), + ac_cv_have_clock_monotonic, + [AC_TRY_LINK([#include <time.h>], + [ struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); ], + ac_cv_have_clock_monotonic=yes, + ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS + if test "$ac_cv_have_clock_monotonic" = "yes"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ if test "$ac_cv_search_clock_gettime" != "none required"; then ++ REALTIME_LIBS=$ac_cv_search_clock_gettime ++ fi + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) +@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi +@@ -6022,6 +6024,14 @@ + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; ++ FreeBSD:i386) ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ ;; + SunOS:x86) + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 |