[jhbuild] patches: mozjs45-1176787-disable-mozglue.patch update
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] patches: mozjs45-1176787-disable-mozglue.patch update
- Date: Sat, 13 May 2017 05:21:52 +0000 (UTC)
commit b4db6972cd5591be7da3bdd43dc34f47e1082270
Author: Philip Chimento <philip chimento gmail com>
Date: Fri May 12 22:20:09 2017 -0700
patches: mozjs45-1176787-disable-mozglue.patch update
This adds a hunk to this patch that ensures the patch has the intended
effect on macOS as well.
patches/mozjs45-1176787-disable-mozglue.patch | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/patches/mozjs45-1176787-disable-mozglue.patch b/patches/mozjs45-1176787-disable-mozglue.patch
index a94d2cb..37d30e2 100644
--- a/patches/mozjs45-1176787-disable-mozglue.patch
+++ b/patches/mozjs45-1176787-disable-mozglue.patch
@@ -85,3 +85,14 @@ diff --git a/js/src/configure.in b/js/src/configure.in
if test "$MOZ_MEMORY"; then
cat >> confdefs.pytmp <<\EOF
+--- a/mozglue/build/moz.build 2017-04-29 18:04:50.000000000 -0700
++++ b/mozglue/build/moz.build 2017-04-29 18:04:57.000000000 -0700
+@@ -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')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]