[jhbuild] core-deps-3.24: Patch mozjs38 to not symlink headers



commit 3fb2cc516f194d3472522024b11d9da3fb058eb7
Author: Philip Chimento <philip endlessm com>
Date:   Thu Feb 16 13:50:55 2017 -0800

    core-deps-3.24: Patch mozjs38 to not symlink headers
    
    By default mozbuild will install headers as symlinks back to the build
    directory! This is no good for standalone mozjs.

 modulesets/gnome-suites-core-deps-3.24.modules |    1 +
 patches/mozjs38-copy-headers.patch             |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index ad58142..be1faf0 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -1550,6 +1550,7 @@
       <patch file="mozjs38-shell-version.patch" strip="1"/>
       <patch file="mozjs38-pkg-config-version.patch" strip="1"/>
       <patch file="mozjs38-install-name.patch" strip="1"/>
+      <patch file="mozjs38-copy-headers.patch" strip="1"/>
       <patch file="mozjs38-1269317.patch" strip="1"/>
     </branch>
     <dependencies>
diff --git a/patches/mozjs38-copy-headers.patch b/patches/mozjs38-copy-headers.patch
new file mode 100644
index 0000000..7f352a7
--- /dev/null
+++ b/patches/mozjs38-copy-headers.patch
@@ -0,0 +1,20 @@
+Description: Copy headers on install instead of symlinking
+Author: Rico Tzschichholz <ricotz ubuntu com>
+Forwarded: no
+Last-Update: 2014-10-29
+
+---
+
+Index: b/python/mozbuild/mozbuild/backend/recursivemake.py
+===================================================================
+--- a/python/mozbuild/mozbuild/backend/recursivemake.py
++++ b/python/mozbuild/mozbuild/backend/recursivemake.py
+@@ -796,7 +796,7 @@
+             return
+ 
+         for source, dest, _ in self._walk_hierarchy(obj, exports):
+-            self._install_manifests['dist_include'].add_symlink(source, dest)
++            self._install_manifests['dist_include'].add_copy(source, dest)
+ 
+             if not os.path.exists(source):
+                 raise Exception('File listed in EXPORTS does not exist: %s' % source)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]