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.in | |
| parent | 13e9a0c06d35bb02d211df873c105a350aeab8eb (diff) | |
| download | uxp-7c728b3c7680662fc4e92b5d03697b8339560b08.tar.gz | |
Update NSPR to 4.16
Diffstat (limited to 'nsprpub/configure.in')
| -rw-r--r-- | nsprpub/configure.in | 49 |
1 files changed, 47 insertions, 2 deletions
diff --git a/nsprpub/configure.in b/nsprpub/configure.in index 202158b799..22b4e72245 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -15,8 +15,8 @@ dnl ======================================================== dnl = Defaults dnl ======================================================== 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= @@ -716,6 +716,40 @@ else fi dnl ======================================================== +dnl Check for pragma diagnostic +dnl ======================================================== + +AC_MSG_CHECKING([for pragma diagnostic]) +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 + AC_MSG_RESULT([$_res]) +else + AC_MSG_RESULT([no]) +fi + +dnl ======================================================== dnl Profile guided optimization dnl ======================================================== dnl Test for profiling options @@ -1349,6 +1383,13 @@ case "$target" in AC_DEFINE(DARWIN) AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_SOCKLEN_T) + AC_DEFINE(HAVE_POINTER_LOCALTIME_R) + changequote(,) + HOST_DARWIN_MAJOR=`echo "$build_os" | sed -E -e 's/^darwin([0-9]+).*$/\1/'` + changequote([,]) + if test "$HOST_DARWIN_MAJOR" -ge 15 ; then + AC_DEFINE(HAS_CONNECTX) + fi AS='$(CC) -x assembler-with-cpp' CFLAGS="$CFLAGS -Wall -fno-common" case "${target_cpu}" in @@ -1519,6 +1560,7 @@ tools are selected during the Xcode/Developer Tools installation.]) AC_DEFINE(FREEBSD) AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_SOCKLEN_T) + AC_DEFINE(HAVE_POINTER_LOCALTIME_R) CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` if test "$MOZ_OBJFORMAT" = "elf"; then @@ -1789,6 +1831,7 @@ tools are selected during the Xcode/Developer Tools installation.]) AC_DEFINE(XP_UNIX) AC_DEFINE(_GNU_SOURCE) AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) + AC_DEFINE(HAVE_POINTER_LOCALTIME_R) case "${target}" in *-android*|*-linuxandroid*) OS_TARGET=Android @@ -2078,6 +2121,7 @@ tools are selected during the Xcode/Developer Tools installation.]) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_SOCKLEN_T) + AC_DEFINE(HAVE_POINTER_LOCALTIME_R) if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 fi @@ -2126,6 +2170,7 @@ tools are selected during the Xcode/Developer Tools installation.]) AC_DEFINE(OPENBSD) AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_SOCKLEN_T) + AC_DEFINE(HAVE_POINTER_LOCALTIME_R) CFLAGS="$CFLAGS -ansi -Wall" CXXFLAGS="$CXXFLAGS -ansi -Wall" DLL_SUFFIX=so.1.0 |