diff options
Diffstat (limited to 'lang/spidermonkey52/files/patch-disable-mozglue')
| -rw-r--r-- | lang/spidermonkey52/files/patch-disable-mozglue | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/lang/spidermonkey52/files/patch-disable-mozglue b/lang/spidermonkey52/files/patch-disable-mozglue deleted file mode 100644 index 66a1d3fd8df6..000000000000 --- a/lang/spidermonkey52/files/patch-disable-mozglue +++ /dev/null @@ -1,62 +0,0 @@ -From 1dd00ba521afd812ba42d94be8772603d3590b43 Mon Sep 17 00:00:00 2001 -From: Till Schneidereit <till@tillschneidereit.net> -Date: Thu, 1 Oct 2015 12:59:09 +0200 -Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all - platforms - -Otherwise, build fails not being able to find HashBytes. - -Patch ported forward to mozjs52 by Philip Chimento -<philip.chimento@gmail.com>. - -https://bugzilla.mozilla.org/show_bug.cgi?id=1176787 ---- - -diff --git a/js/src/old-configure.in b/js/src/old-configure.in -index 1c5c9e214..ff0617e31 100644 ---- js/src/old-configure.in -+++ js/src/old-configure.in -@@ -1623,16 +1623,21 @@ dnl ======================================================== - dnl = Enable jemalloc - dnl ======================================================== - --case "${OS_TARGET}" in --Android|WINNT|Darwin) -+dnl In stand-alone builds we always only want to link executables against mozglue. -+if test "$JS_STANDALONE"; then - MOZ_GLUE_IN_PROGRAM= -- ;; --*) -- dnl On !Android !Windows !OSX, we only want to link executables against mozglue -- MOZ_GLUE_IN_PROGRAM=1 -- AC_DEFINE(MOZ_GLUE_IN_PROGRAM) -- ;; --esac -+else -+ case "${OS_TARGET}" in -+ Android|WINNT|Darwin) -+ MOZ_GLUE_IN_PROGRAM= -+ ;; -+ *) -+ dnl On !Android !Windows !OSX, we only want to link executables against mozglue -+ MOZ_GLUE_IN_PROGRAM=1 -+ AC_DEFINE(MOZ_GLUE_IN_PROGRAM) -+ ;; -+ esac -+fi - - if test "$MOZ_MEMORY"; then - if test "x$MOZ_DEBUG" = "x1"; then -diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build -index d28974778..e3be5a2b9 100644 ---- mozglue/build/moz.build -+++ mozglue/build/moz.build -@@ -6,7 +6,7 @@ - - # Build mozglue as a shared lib on Windows, OSX and Android. - # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in --if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): -+if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']: - SharedLibrary('mozglue') - else: - Library('mozglue') |