summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-30 18:15:38 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-30 18:15:38 +0100
commit499b2873944530396cc8aecbc7bdd1a2a2c66caa (patch)
tree1378b26d0c9ccabd0df0b88c9f751960461e2c5d /build
parent00a5321c958de1f378ac9dacafb6f81ded57441e (diff)
downloadUXP-499b2873944530396cc8aecbc7bdd1a2a2c66caa.tar
UXP-499b2873944530396cc8aecbc7bdd1a2a2c66caa.tar.gz
UXP-499b2873944530396cc8aecbc7bdd1a2a2c66caa.tar.lz
UXP-499b2873944530396cc8aecbc7bdd1a2a2c66caa.tar.xz
UXP-499b2873944530396cc8aecbc7bdd1a2a2c66caa.zip
Issue #1342 - Remove support for system NSPR/NSS
Diffstat (limited to 'build')
-rw-r--r--build/autoconf/nspr-build.m434
-rw-r--r--build/directive4.py2
2 files changed, 2 insertions, 34 deletions
diff --git a/build/autoconf/nspr-build.m4 b/build/autoconf/nspr-build.m4
index b733579c2..b53fb4d37 100644
--- a/build/autoconf/nspr-build.m4
+++ b/build/autoconf/nspr-build.m4
@@ -42,15 +42,6 @@ if test "$MOZ_BUILD_APP" != js || test -n "$JS_STANDALONE"; then
_IS_OUTER_CONFIGURE=1
fi
-MOZ_ARG_WITH_BOOL(system-nspr,
-[ --with-system-nspr Use an NSPR that is already built and installed.
- Use the 'nspr-config' script in the current path,
- or look for the script in the directories given with
- --with-nspr-exec-prefix or --with-nspr-prefix.
- (Those flags are only checked if you specify
- --with-system-nspr.)],
- _USE_SYSTEM_NSPR=1 )
-
JS_POSIX_NSPR=unset
ifdef([CONFIGURING_JS],[
if test -n "$JS_STANDALONE"; then
@@ -71,7 +62,6 @@ ifdef([CONFIGURING_JS],[
])
dnl Pass at most one of
-dnl --with-system-nspr
dnl --with-nspr-cflags/libs
dnl --enable-nspr-build
dnl --enable-posix-nspr-emulation
@@ -79,10 +69,6 @@ dnl --enable-posix-nspr-emulation
AC_MSG_CHECKING([NSPR selection])
nspr_opts=
which_nspr=default
-if test -n "$_USE_SYSTEM_NSPR"; then
- nspr_opts="x$nspr_opts"
- which_nspr="system"
-fi
if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
nspr_opts="x$nspr_opts"
which_nspr="command-line"
@@ -136,11 +122,7 @@ fi
# anything itself.
if test -n "$_IS_OUTER_CONFIGURE"; then
-if test -n "$_USE_SYSTEM_NSPR"; then
- AM_PATH_NSPR($NSPR_MINVER, [MOZ_SYSTEM_NSPR=1], [AC_MSG_ERROR([you do not have NSPR installed or your version is older than $NSPR_MINVER.])])
-fi
-
-if test -n "$MOZ_SYSTEM_NSPR" -o -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
+if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $NSPR_CFLAGS"
AC_TRY_COMPILE([#include "prtypes.h"],
@@ -178,19 +160,7 @@ AC_SUBST(NSPR_INCLUDE_DIR)
AC_SUBST(NSPR_LIB_DIR)
PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr"
-if test -n "$MOZ_SYSTEM_NSPR"; then
- _SAVE_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $NSPR_CFLAGS"
- AC_TRY_COMPILE([#include "prlog.h"],
- [#ifndef PR_STATIC_ASSERT
- #error PR_STATIC_ASSERT not defined
- #endif],
- ,
- AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
- CFLAGS=$_SAVE_CFLAGS
- # piggy back on $MOZ_SYSTEM_NSPR to set a variable for the nspr check for js.pc
- PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr >= $NSPR_MINVER"
-elif test -n "$JS_POSIX_NSPR"; then
+if test -n "$JS_POSIX_NSPR"; then
PKGCONF_REQUIRES_PRIVATE=
fi
AC_SUBST([PKGCONF_REQUIRES_PRIVATE])
diff --git a/build/directive4.py b/build/directive4.py
index bb832f6b7..38465628b 100644
--- a/build/directive4.py
+++ b/build/directive4.py
@@ -33,8 +33,6 @@ if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("br
# Applies to Pale Moon and Basilisk
if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig):
listViolations += [
- 'MOZ_SYSTEM_NSS',
- 'MOZ_SYSTEM_NSPR',
'MOZ_SYSTEM_JPEG',
'MOZ_SYSTEM_ZLIB',
'MOZ_SYSTEM_BZ2',