summaryrefslogtreecommitdiff
path: root/nsprpub/configure
diff options
context:
space:
mode:
Diffstat (limited to 'nsprpub/configure')
-rwxr-xr-xnsprpub/configure118
1 files changed, 61 insertions, 57 deletions
diff --git a/nsprpub/configure b/nsprpub/configure
index 68dfd5f62b..b89064b2c0 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -1467,7 +1467,7 @@ Optional Features:
--enable-cplus Enable some c++ api routines
--enable-macos-target=VER
Set the minimum MacOS version needed at runtime
- 10.2 for ppc, 10.4 for x86
+ 10.3 for ppc, 10.4 for x86
--disable-os2-high-mem Disable high-memory support on OS/2
--enable-strip Enable stripping of shared libs and programs
@@ -2486,7 +2486,7 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=24
+MOD_MINOR_VERSION=29
MOD_PATCH_VERSION=0
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
@@ -5587,6 +5587,7 @@ if test -n "$CROSS_COMPILE"; then
linux*) OS_ARCH=Linux ;;
solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
mingw*) OS_ARCH=WINNT CPU_ARCH=x86 ;;
+ cygwin*) OS_ARCH=WINNT ;;
darwin*) OS_ARCH=Darwin ;;
riscos*) OS_ARCH=RISCOS ;;
esac
@@ -6457,12 +6458,22 @@ fi
CPU_ARCH=i386
fi
;;
+ aarch64)
+ CPU_ARCH=aarch64
+ ;;
*)
CPU_ARCH=ppc
;;
esac
if test "`echo $CC | grep -c '\-arch '`" = "0"; then
- CC="$CC -arch $CPU_ARCH"
+ case "$CPU_ARCH" in
+ aarch64)
+ CC="$CC -arch arm64"
+ ;;
+ *)
+ CC="$CC -arch $CPU_ARCH"
+ ;;
+ esac
fi
ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default"
if test "x$ac_cv_header_crt_externs_h" = xyes; then :
@@ -6482,78 +6493,71 @@ fi
PR_MD_CSRCS=darwin.c
PR_MD_ASFILES=os_Darwin.s
- # Add Mac OS X support for loading CFM & CFBundle plugins
- if test -f "${MACOS_SDK_DIR}/System/Library/Frameworks/Carbon.framework/Carbon"; then
- $as_echo "#define XP_MACOSX 1" >>confdefs.h
-
- OS_TARGET=MacOSX
-
- if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
- export MACOSX_DEPLOYMENT_TARGET=$_MACOSX_DEPLOYMENT_TARGET
- elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
- case "${target_cpu}" in
- powerpc*)
- export MACOSX_DEPLOYMENT_TARGET=10.2
- ;;
- i*86*)
- export MACOSX_DEPLOYMENT_TARGET=10.4
- ;;
- esac
- fi
+ if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
+ export MACOSX_DEPLOYMENT_TARGET=$_MACOSX_DEPLOYMENT_TARGET
+ elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
+ case "${target_cpu}" in
+ powerpc*)
+ export MACOSX_DEPLOYMENT_TARGET=10.3
+ ;;
+ i*86*)
+ export MACOSX_DEPLOYMENT_TARGET=10.4
+ ;;
+ esac
+ fi
- if test "$MACOS_SDK_DIR"; then
+ if test "$MACOS_SDK_DIR"; then
- if test ! -d "$MACOS_SDK_DIR"; then
- as_fn_error $? "SDK not found. When using --with-macos-sdk, you must
+ if test ! -d "$MACOS_SDK_DIR"; then
+ as_fn_error $? "SDK not found. When using --with-macos-sdk, you must
specify a valid SDK. SDKs are installed when the optional cross-development
tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5
- fi
+ fi
- CC_VERSION=`$CC -v 2>&1 | grep 'gcc version'`
- GCC_VERSION_FULL=`echo $CC_VERSION | $PERL -pe 's/^.*gcc version ([^ ]*).*/$1/'`
- GCC_VERSION=`echo $GCC_VERSION_FULL | $PERL -pe '(split(/\./))[0]>=4&&s/(^\d*\.\d*).*/$1/;'`
+ CC_VERSION=`$CC -v 2>&1 | grep 'gcc version'`
+ GCC_VERSION_FULL=`echo $CC_VERSION | $PERL -pe 's/^.*gcc version ([^ ]*).*/$1/'`
+ GCC_VERSION=`echo $GCC_VERSION_FULL | $PERL -pe '(split(/\./))[0]>=4&&s/(^\d*\.\d*).*/$1/;'`
- GCC_VERSION_MAJOR=`echo $GCC_VERSION_FULL | $PERL -pe 's/(^\d*).*/$1/;'`
- if test "$GCC_VERSION_MAJOR" -lt "4" ; then
- SDK_C_FRAMEWORK="-F${MACOS_SDK_DIR}/System/Library/Frameworks"
- if test -d "${MACOS_SDK_DIR}/Library/Frameworks" ; then
- SDK_C_FRAMEWORK="$SDK_C_FRAMEWORK -F${MACOS_SDK_DIR}/Library/Frameworks"
- fi
+ GCC_VERSION_MAJOR=`echo $GCC_VERSION_FULL | $PERL -pe 's/(^\d*).*/$1/;'`
+ if test "$GCC_VERSION_MAJOR" -lt "4" ; then
+ SDK_C_FRAMEWORK="-F${MACOS_SDK_DIR}/System/Library/Frameworks"
+ if test -d "${MACOS_SDK_DIR}/Library/Frameworks" ; then
+ SDK_C_FRAMEWORK="$SDK_C_FRAMEWORK -F${MACOS_SDK_DIR}/Library/Frameworks"
+ fi
- SDK_C_INCLUDE="-isystem ${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOS_SDK_DIR}/usr/include ${SDK_C_FRAMEWORK}"
+ SDK_C_INCLUDE="-isystem ${MACOS_SDK_DIR}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOS_SDK_DIR}/usr/include ${SDK_C_FRAMEWORK}"
- CFLAGS="$CFLAGS -nostdinc ${SDK_C_INCLUDE}"
+ CFLAGS="$CFLAGS -nostdinc ${SDK_C_INCLUDE}"
- CPP="$CPP -nostdinc ${SDK_C_INCLUDE}"
+ CPP="$CPP -nostdinc ${SDK_C_INCLUDE}"
- HOST_DARWIN_MAJOR=`echo "$build_os" | sed -E -e 's/^darwin([0-9]+).*$/\1/'`
+ HOST_DARWIN_MAJOR=`echo "$build_os" | sed -E -e 's/^darwin([0-9]+).*$/\1/'`
- if test "$HOST_DARWIN_MAJOR" -lt 9 ; then
- MACOS_SDK_LIBS="-L${MACOS_SDK_DIR}/usr/lib/gcc/darwin -L${MACOS_SDK_DIR}/usr/lib/gcc/darwin/${GCC_VERSION_FULL} -L${MACOS_SDK_DIR}/usr/lib ${SDK_C_FRAMEWORK}"
- else
- MACOS_SDK_LIBS="-Wl,-syslibroot,${MACOS_SDK_DIR}"
- fi
+ if test "$HOST_DARWIN_MAJOR" -lt 9 ; then
+ MACOS_SDK_LIBS="-L${MACOS_SDK_DIR}/usr/lib/gcc/darwin -L${MACOS_SDK_DIR}/usr/lib/gcc/darwin/${GCC_VERSION_FULL} -L${MACOS_SDK_DIR}/usr/lib ${SDK_C_FRAMEWORK}"
+ else
+ MACOS_SDK_LIBS="-Wl,-syslibroot,${MACOS_SDK_DIR}"
+ fi
- LDFLAGS="${MACOS_SDK_LIBS} $LDFLAGS"
- export NEXT_ROOT=$MACOS_SDK_DIR
+ LDFLAGS="${MACOS_SDK_LIBS} $LDFLAGS"
+ export NEXT_ROOT=$MACOS_SDK_DIR
- if test -n "$CROSS_COMPILE" ; then
- HOST_CC="NEXT_ROOT= $HOST_CC"
- HOST_CXX="NEXT_ROOT= $HOST_CXX"
- fi
- else
- CFLAGS="$CFLAGS -isysroot ${MACOS_SDK_DIR}"
+ if test -n "$CROSS_COMPILE" ; then
+ HOST_CC="NEXT_ROOT= $HOST_CC"
+ HOST_CXX="NEXT_ROOT= $HOST_CXX"
+ fi
+ else
+ CFLAGS="$CFLAGS -isysroot ${MACOS_SDK_DIR}"
- CPP="$CPP -isysroot ${MACOS_SDK_DIR}"
+ CPP="$CPP -isysroot ${MACOS_SDK_DIR}"
- if test "$GCC_VERSION_FULL" != "4.0.0" ; then
- LDFLAGS="$LDFLAGS -isysroot ${MACOS_SDK_DIR}"
- else
- LDFLAGS="$LDFLAGS -Wl,-syslibroot,${MACOS_SDK_DIR}"
- fi
+ if test "$GCC_VERSION_FULL" != "4.0.0" ; then
+ LDFLAGS="$LDFLAGS -isysroot ${MACOS_SDK_DIR}"
+ else
+ LDFLAGS="$LDFLAGS -Wl,-syslibroot,${MACOS_SDK_DIR}"
fi
fi
fi
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-14 22:58:16 +0000