c1e827f955
- make plugin-container work with custom LD_LIBRARY_PATH [2] Do not bump PORTREVISION as firefox package was not buildable due to size constraints before my last bsd.gecko.mk commit. PR: ports/158371 [1] Submitted by: Pan Tsu <inyaoo@gmail.com> [1] kmoore [2] Obtained from: mozilla bugtracker [2]
86 lines
2.7 KiB
Text
86 lines
2.7 KiB
Text
--- 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
|
|
;;
|
|
|
|
-x86_64 | ia64)
|
|
+amd64 | x86_64 | ia64)
|
|
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
|
|
@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
|
|
LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
|
|
LIBJPEG_TURBO_X64_ASM=1
|
|
;;
|
|
+ FreeBSD:i386)
|
|
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
|
|
+ LIBJPEG_TURBO_X86_ASM=1
|
|
+ ;;
|
|
+ FreeBSD:amd64)
|
|
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
|
|
+ LIBJPEG_TURBO_X64_ASM=1
|
|
+ ;;
|
|
SunOS:i?86)
|
|
LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
|
|
LIBJPEG_TURBO_X86_ASM=1
|