[gnome-continuous] manifest: Add mozjs38 patch to copy instead symlink headers
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] manifest: Add mozjs38 patch to copy instead symlink headers
- Date: Thu, 16 Feb 2017 21:36:53 +0000 (UTC)
commit 017520b70ff8c0cbdc65eb5a5930ca51e5a9d70b
Author: Javier Jardón <jjardon gnome org>
Date: Thu Feb 16 21:35:02 2017 +0000
manifest: Add mozjs38 patch to copy instead symlink headers
This was causing the folloowing error in gjs:
cc1plus: fatal error: /usr/include/mozjs-38/js/RequiredDefines.h: No such file or directory
manifest.json | 1 +
patches/mozjs38-copy-headers.patch | 29 +++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 1e49cc3..cf91fad 100644
--- a/manifest.json
+++ b/manifest.json
@@ -893,6 +893,7 @@
"mozjs38-1269317.patch",
"mozjs38-release-number.patch",
"mozjs38-shell-version.patch",
+ "mozjs38-copy-headers.patch",
"mozjs38-pkg-config-version.patch"],
"config-opts": ["--enable-posix-nspr-emulation",
"--disable-tests",
diff --git a/patches/mozjs38-copy-headers.patch b/patches/mozjs38-copy-headers.patch
new file mode 100644
index 0000000..8c58d18
--- /dev/null
+++ b/patches/mozjs38-copy-headers.patch
@@ -0,0 +1,29 @@
+From 130ad767ef8753959e30b73610b53e4be9b12ab7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Thu, 16 Feb 2017 21:32:30 +0000
+Subject: [PATCH] copy-headers
+
+Description: Copy headers on install instead of symlinking
+Author: Rico Tzschichholz <ricotz ubuntu com>
+Forwarded: no
+Last-Update: 2014-10-29
+---
+ python/mozbuild/mozbuild/backend/recursivemake.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py
b/python/mozbuild/mozbuild/backend/recursivemake.py
+index 0c4eb38d..f10d2cd9 100644
+--- a/python/mozbuild/mozbuild/backend/recursivemake.py
++++ b/python/mozbuild/mozbuild/backend/recursivemake.py
+@@ -796,7 +796,7 @@ class RecursiveMakeBackend(CommonBackend):
+ 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)
+--
+2.11.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]