| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 2fb531ac753500314336ccd508cb2d53f5e768e5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Till Schneidereit <till@tillschneidereit.net> |
| 3 | Date: Thu, 1 Oct 2015 12:59:09 +0200 |
| 4 | Subject: Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all platforms |
| 5 | |
| 6 | Otherwise, build fails not being able to find HashBytes. |
| 7 | |
| 8 | Patch ported forward to mozjs52 by Philip Chimento |
| 9 | <philip.chimento@gmail.com>. |
| 10 | |
| 11 | https://bugzilla.mozilla.org/show_bug.cgi?id=1176787 |
| 12 | |
| 13 | Upstream-Status: Backport |
| 14 | |
| 15 | Signed-off-by: Ricardo Salveti <ricardo@foundries.io> |
| 16 | --- |
| 17 | js/src/old-configure | 20 ++++++++++++-------- |
| 18 | mozglue/build/moz.build | 2 +- |
| 19 | 2 files changed, 13 insertions(+), 9 deletions(-) |
| 20 | |
| 21 | diff --git a/js/src/old-configure b/js/src/old-configure |
| 22 | index d7afcff..8a6f142 100644 |
| 23 | --- a/js/src/old-configure |
| 24 | +++ b/js/src/old-configure |
| 25 | @@ -8546,21 +8546,25 @@ if test -z "$MOZ_ENABLE_WARNINGS_AS_ERRORS"; then |
| 26 | fi |
| 27 | |
| 28 | |
| 29 | -case "${OS_TARGET}" in |
| 30 | -Android|WINNT|Darwin) |
| 31 | +if test "$JS_STANDALONE"; then |
| 32 | MOZ_GLUE_IN_PROGRAM= |
| 33 | - ;; |
| 34 | -*) |
| 35 | - MOZ_GLUE_IN_PROGRAM=1 |
| 36 | - cat >> confdefs.pytmp <<\EOF |
| 37 | +else |
| 38 | + case "${OS_TARGET}" in |
| 39 | + Android|WINNT|Darwin) |
| 40 | + MOZ_GLUE_IN_PROGRAM= |
| 41 | + ;; |
| 42 | + *) |
| 43 | + MOZ_GLUE_IN_PROGRAM=1 |
| 44 | + cat >> confdefs.pytmp <<\EOF |
| 45 | (''' MOZ_GLUE_IN_PROGRAM ''', ' 1 ') |
| 46 | EOF |
| 47 | cat >> confdefs.h <<\EOF |
| 48 | #define MOZ_GLUE_IN_PROGRAM 1 |
| 49 | EOF |
| 50 | |
| 51 | - ;; |
| 52 | -esac |
| 53 | + ;; |
| 54 | + esac |
| 55 | +fi |
| 56 | |
| 57 | if test "$MOZ_MEMORY"; then |
| 58 | if test "x$MOZ_DEBUG" = "x1"; then |
| 59 | diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build |
| 60 | index d289747..e3be5a2 100644 |
| 61 | --- a/mozglue/build/moz.build |
| 62 | +++ b/mozglue/build/moz.build |
| 63 | @@ -6,7 +6,7 @@ |
| 64 | |
| 65 | # Build mozglue as a shared lib on Windows, OSX and Android. |
| 66 | # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in |
| 67 | -if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): |
| 68 | +if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']: |
| 69 | SharedLibrary('mozglue') |
| 70 | else: |
| 71 | Library('mozglue') |
| 72 | -- |
| 73 | 2.7.4 |
| 74 | |