diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-06 11:40:35 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-06 11:40:35 +0100 |
commit | 7c728b3c7680662fc4e92b5d03697b8339560b08 (patch) | |
tree | 4a0da02f99913e0d52acd52067ad5a7be29e99a3 /nsprpub/configure | |
parent | 13e9a0c06d35bb02d211df873c105a350aeab8eb (diff) | |
download | UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.tar UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.tar.gz UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.tar.lz UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.tar.xz UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.zip |
Update NSPR to 4.16
Diffstat (limited to 'nsprpub/configure')
-rwxr-xr-x | nsprpub/configure | 53 |
1 files changed, 51 insertions, 2 deletions
diff --git a/nsprpub/configure b/nsprpub/configure index fb3b3e2ab..b8ad2b4eb 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -2488,8 +2488,8 @@ test -n "$target_alias" && program_prefix=${target_alias}- MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=13 -MOD_PATCH_VERSION=1 +MOD_MINOR_VERSION=16 +MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -5424,6 +5424,40 @@ $as_echo "no" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pragma diagnostic" >&5 +$as_echo_n "checking for pragma diagnostic... " >&6; } +if test "$GNU_CC" = "1"; then + cat >dummy-hello.c <<EOF +#ifdef _PR_HAS_PRAGMA_DIAGNOSTIC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" +#endif +int main() { + char *dummy = ""; + return 0; +} +EOF + ${CC} -Werror=unused-but-set-variable -S dummy-hello.c -o dummy-hello.s 2>&5 + if test $? != 0; then + ${CC} -Werror=unused-but-set-variable -D_PR_HAS_PRAGMA_DIAGNOSTIC -S dummy-hello.c -o dummy-hello.s 2>&5 + if test $? = 0; then + CFLAGS="$CFLAGS -D_PR_HAS_PRAGMA_DIAGNOSTIC=1" + _res=yes + else + _res=no + fi + else + _res=no + fi + rm -f dummy-hello.c dummy-hello.s + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_res" >&5 +$as_echo "$_res" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" @@ -6524,6 +6558,13 @@ fi $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h + $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h + + HOST_DARWIN_MAJOR=`echo "$build_os" | sed -E -e 's/^darwin([0-9]+).*$/\1/'` + if test "$HOST_DARWIN_MAJOR" -ge 15 ; then + $as_echo "#define HAS_CONNECTX 1" >>confdefs.h + fi + AS='$(CC) -x assembler-with-cpp' CFLAGS="$CFLAGS -Wall -fno-common" case "${target_cpu}" in @@ -6673,6 +6714,8 @@ tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5 $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h + $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` if test "$MOZ_OBJFORMAT" = "elf"; then @@ -6975,6 +7018,8 @@ tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5 $as_echo "#define HAVE_FCNTL_FILE_LOCKING 1" >>confdefs.h + $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h + case "${target}" in *-android*|*-linuxandroid*) OS_TARGET=Android @@ -7281,6 +7326,8 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h + $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h + if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi @@ -7337,6 +7384,8 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h + $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h + CFLAGS="$CFLAGS -ansi -Wall" CXXFLAGS="$CXXFLAGS -ansi -Wall" DLL_SUFFIX=so.1.0 |