From f7e4298a1fd8168de7073de5f9a1a70f64921427 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Tue, 1 Nov 2011 22:05:59 +0000 Subject: [PATCH] Use the same workaround that Mk/bsd.gecko.mk uses by diddling with the generated config files rather than patching the sources. (As a side note, there is an Mk/bsd.gecko.mk!) --- 3rdp/build/GNUmakefile | 2 +- 3rdp/build/jsnativestack.cpp.patch | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 3rdp/build/jsnativestack.cpp.patch diff --git a/3rdp/build/GNUmakefile b/3rdp/build/GNUmakefile index 11d069e174..2122fa2fc4 100644 --- a/3rdp/build/GNUmakefile +++ b/3rdp/build/GNUmakefile @@ -30,7 +30,7 @@ $(JSLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/libmozjs.tgz | $(JS_SRC) $(JS_IDIR) @echo Creating $@ ... $(QUIET)-rm -rf $(JS_SRC)/* $(QUIET)tar -xzC $(JS_SRC) -f $(3RDPDISTDIR)$(DIRSEP)libmozjs.tgz - $(QUIET)patch -d $(JS_SRC) < jsnativestack.cpp.patch + $(QUIET)echo "pthread_np.h" >> $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src$(DIRSEP)config$(DIRSEP)system-headers -$(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && autoconf-2.13 $(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && ./configure $(JS_CONFIGURE_ARGS) $(QUIET)$(MAKE) -C $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src diff --git a/3rdp/build/jsnativestack.cpp.patch b/3rdp/build/jsnativestack.cpp.patch deleted file mode 100644 index 685b47a0f9..0000000000 --- a/3rdp/build/jsnativestack.cpp.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- js-1.8.5/js/src/jsnativestack.cpp.orig 2011-11-01 00:58:59.000000000 -0700 -+++ js-1.8.5/js/src/jsnativestack.cpp 2011-11-01 01:02:48.000000000 -0700 -@@ -48,11 +48,13 @@ - # include <os2.h> - - #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) -+# pragma GCC visibility push(default) - # include <pthread.h> - - # if defined(__FreeBSD__) - # include <pthread_np.h> - # endif -+# pragma GCC visibility pop - - #else - # error "Unsupported platform" -- GitLab