Index: head/games/0ad/files/patch-libraries__source__spidermonkey__build.sh =================================================================== --- head/games/0ad/files/patch-libraries__source__spidermonkey__build.sh (revision 416482) +++ head/games/0ad/files/patch-libraries__source__spidermonkey__build.sh (revision 416483) @@ -1,25 +1,17 @@ ---- libraries/source/spidermonkey/build.sh.orig 2015-09-30 20:28:13 UTC +--- libraries/source/spidermonkey/build.sh.orig 2015-01-24 14:46:52 UTC +++ libraries/source/spidermonkey/build.sh -@@ -25,7 +25,6 @@ else - MAKE=${MAKE:="make"} - fi - --MAKE_OPTS="${JOBS}" - - CONF_OPTS="--enable-shared-js --enable-gcgenerational --disable-tests --without-intl-api" # --enable-trace-logging" - -@@ -82,6 +81,14 @@ cd js/src +@@ -95,6 +95,14 @@ cd mozjs31/js/src rm -rf build-debug rm -rf build-release +cp jsnativestack.cpp jsnativestack.cpp.orig +sed 's/# include /#pragma GCC visibility push(default)\ +#include \ +#pragma GCC visibility pop/' jsnativestack.cpp.orig >jsnativestack.cpp + +cp configure configure.orig +sed -e 's/"$ac_cv_have_visibility_class_bug" = "no"; then/"$ac_cv_have_visibility_class_bug" = "no" -a "$OS_ARCH" != "FreeBSD" ; then/' -e 's/-Werror=conversion-null//' configure.orig >configure + # We want separate debug/release versions of the library, so we have to change # the LIBRARY_NAME for each build. # (We use perl instead of sed so that it works with MozillaBuild on Windows,