aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
Diffstat (limited to 'games')
-rw-r--r--games/0ad/files/patch-libraries__source__spidermonkey__build.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/games/0ad/files/patch-libraries__source__spidermonkey__build.sh b/games/0ad/files/patch-libraries__source__spidermonkey__build.sh
index 29210bee68c1..fc0133e4ba0d 100644
--- a/games/0ad/files/patch-libraries__source__spidermonkey__build.sh
+++ b/games/0ad/files/patch-libraries__source__spidermonkey__build.sh
@@ -1,8 +1,8 @@
---- libraries/source/spidermonkey/build.sh.orig 2014-09-24 08:29:20 UTC
+--- libraries/source/spidermonkey/build.sh.orig 2015-01-24 14:46:52 UTC
+++ libraries/source/spidermonkey/build.sh
-@@ -66,6 +66,14 @@
-
- cd mozjs24/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 <pthread_np.h>/#pragma GCC visibility push(default)\
@@ -10,7 +10,7 @@
+#pragma GCC visibility pop/' jsnativestack.cpp.orig >jsnativestack.cpp
+
+cp configure configure.orig
-+sed 's/"$ac_cv_have_visibility_class_bug" = "no"; then/"$ac_cv_have_visibility_class_bug" = "no" -a "$OS_ARCH" != "FreeBSD" ; then/' configure.orig >configure
++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.