summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-configure.in
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-07-26 21:49:58 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-07-26 21:49:58 +0000
commit30c1a0a7927d6992cbf7baf9e8e1f637b2e4f6d4 (patch)
tree89c0045d73cc71a8a86842d8aa10f24e71cb5f26 /www/firefox/files/patch-configure.in
parent- Update to 0.07 (diff)
- update firefox/thunderbird ESR versions to 10.0.6
- update firefox 14.0.1 - update thunderbird to 14.0 - update seamonkey to 2.11 - switch to new options framework - add experimental rendering via cairo-qt (QT4 option) - add audio backend options (ALSA and PulseAudio) - rename SMB option to GNOMEVFS2 - turn on LOGGING by default (like upstream linux builds) - improve about:memory output - unbreak PGO - use system libs [1] - switch to libevent2 [2] - fix conflict with devel/libunwind and base gcc [3] - unbreak clang/libc++ build [4] - unbreak build with base gcc on >= 9.x [5] - use common IPC code with other BSDs[6] - and *miscellaneous improvements* PR: ports/146231 [1], ports/161421 [2] ports/150631, ports/168369, ports/168637, ports/168793, ports/168978 [3] ports/163454, ports/164905, ports/169231 [4] ports/169389, ports/169479 [5] Obtained from: pkgsrc via bugzilla #753046 [6] In collaboration with: Jan Beich (who did the major part of this work and deserves a special thank you!)
Notes
Notes: svn path=/head/; revision=301582
Diffstat (limited to 'www/firefox/files/patch-configure.in')
-rw-r--r--www/firefox/files/patch-configure.in50
1 files changed, 23 insertions, 27 deletions
diff --git a/www/firefox/files/patch-configure.in b/www/firefox/files/patch-configure.in
index 74abe4451b47..733d3116c1d1 100644
--- a/www/firefox/files/patch-configure.in
+++ b/www/firefox/files/patch-configure.in
@@ -1,32 +1,28 @@
--- configure.in.orig 2012-05-23 20:56:34.000000000 +0200
+++ configure.in 2012-05-27 18:18:25.000000000 +0200
-@@ -1517,7 +1517,7 @@
- CPU_ARCH=sparc
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
- ;;
-
-@@ -1539,7 +1539,7 @@
- dnl ===============================================================
- INTEL_ARCHITECTURE=
- case "$OS_TEST" in
-- x86_64|i?86)
-+ amd64|x86_64|i?86)
- INTEL_ARCHITECTURE=1
- esac
-
-@@ -4580,7 +4580,7 @@
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+ MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++ [MOZ_NATIVE_LIBEVENT=1
++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+@@ -4242,10 +4248,11 @@ else
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+ AC_CHECK_LIB(event, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ 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
@@ -5903,6 +5903,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
@@ -35,7 +31,7 @@
+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+ VPX_X86_ASM=1
+ ;;
-+ FreeBSD:amd64)
++ FreeBSD:x86_64)
+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+ ;;
@@ -50,7 +46,7 @@
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1
+ ;;
-+ FreeBSD:amd64)
++ FreeBSD:x86_64)
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;