Commit 05625da0 authored by Philip Chimento's avatar Philip Chimento 🚮

3.24, 3.26: Remove NSPR dependency from mozjs

We compile mozjs with --enable-posix-nspr-emulation, meaning the
dependency on NSPR can be dropped. However, it's still required in the
pkg-config file, so in practice it would still be linked if present, and
error out if not present.
parent cd87d334
......@@ -1574,6 +1574,7 @@
<patch file="mozjs38-copy-headers.patch" strip="1"/>
<patch file="mozjs38-add-bracket.patch" strip="1"/>
<patch file="mozjs38-1269317.patch" strip="1"/>
<patch file="mozjs38-remove-nspr-dep.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libffi"/>
......
......@@ -1570,6 +1570,7 @@
<patch file="mozjs38-copy-headers.patch" strip="1"/>
<patch file="mozjs38-add-bracket.patch" strip="1"/>
<patch file="mozjs38-1269317.patch" strip="1"/>
<patch file="mozjs38-remove-nspr-dep.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libffi"/>
......@@ -1592,6 +1593,7 @@
<patch file="mozjs45-1269317.patch" strip="1"/>
<patch file="mozjs45-functions-visibility.patch" strip="1"/>
<patch file="mozjs45-1176787-disable-mozglue.patch" strip="1"/>
<patch file="mozjs45-remove-nspr-dep.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libffi"/>
......
Removes the dependency on NSPR from the pkg-config file in the case where
SpiderMonkey was configured with --enable-posix-nspr-emulation.
--- a/build/autoconf/nspr-build.m4 2017-04-24 21:52:45.000000000 -0700
+++ b/build/autoconf/nspr-build.m4 2017-04-24 21:53:42.000000000 -0700
@@ -186,6 +186,8 @@
,
AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
CFLAGS=$_SAVE_CFLAGS
+elif test -n "$JS_POSIX_NSPR"; then
+ NSPR_PKGCONF_CHECK=
fi
AC_SUBST(NSPR_PKGCONF_CHECK)
--- a/js/src/configure 2017-04-24 22:18:01.000000000 -0700
+++ b/js/src/configure 2017-04-24 22:18:30.000000000 -0700
@@ -12494,6 +12494,8 @@
fi
rm -f conftest*
CFLAGS=$_SAVE_CFLAGS
+elif test -n "$JS_POSIX_NSPR"; then
+ NSPR_PKGCONF_CHECK=
fi
Removes the dependency on NSPR from the pkg-config file in the case where
SpiderMonkey was configured with --enable-posix-nspr-emulation.
--- a/build/autoconf/nspr-build.m4 2017-04-24 21:52:45.000000000 -0700
+++ b/build/autoconf/nspr-build.m4 2017-04-24 21:53:42.000000000 -0700
@@ -181,6 +181,8 @@
,
AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
CFLAGS=$_SAVE_CFLAGS
+elif test -n "$JS_POSIX_NSPR"; then
+ NSPR_PKGCONF_CHECK=
fi
AC_SUBST(NSPR_PKGCONF_CHECK)
--- a/js/src/configure 2017-04-24 22:18:01.000000000 -0700
+++ b/js/src/configure 2017-04-24 22:18:30.000000000 -0700
@@ -12863,6 +12863,8 @@
fi
rm -f conftest*
CFLAGS=$_SAVE_CFLAGS
+elif test -n "$JS_POSIX_NSPR"; then
+ NSPR_PKGCONF_CHECK=
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment