summaryrefslogtreecommitdiffstats
path: root/source/l/mozjs60/patches/copy-headers.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/l/mozjs60/patches/copy-headers.patch (renamed from source/l/mozjs52/patches/copy-headers.patch)13
1 files changed, 6 insertions, 7 deletions
diff --git a/source/l/mozjs52/patches/copy-headers.patch b/source/l/mozjs60/patches/copy-headers.patch
index 69b216151..aec3b10a2 100644
--- a/source/l/mozjs52/patches/copy-headers.patch
+++ b/source/l/mozjs60/patches/copy-headers.patch
@@ -1,7 +1,6 @@
-From 8b2d7a77bfb4dbd513763501ed7e9722058ee9af Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 5 Jul 2017 22:45:59 -0700
-Subject: [PATCH] build: Copy headers on install instead of symlinking
+Subject: build: Copy headers on install instead of symlinking
Patch ported forward to mozjs52 by Philip Chimento
<philip.chimento@gmail.com>.
@@ -10,20 +9,20 @@ Patch ported forward to mozjs52 by Philip Chimento
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index 132dcf94..33d489a6 100644
+index dd9020d..6918ef8 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1307,11 +1307,11 @@ def _process_final_target_files(self, obj, files, backend_file):
+@@ -1427,11 +1427,11 @@ class RecursiveMakeBackend(CommonBackend):
raise Exception("Wildcards are only supported in the filename part of "
"srcdir-relative or absolute paths.")
-- install_manifest.add_pattern_symlink(basepath, wild, path)
+- install_manifest.add_pattern_link(basepath, wild, path)
+ install_manifest.add_pattern_copy(basepath, wild, path)
else:
-- install_manifest.add_pattern_symlink(f.srcdir, f, path)
+- install_manifest.add_pattern_link(f.srcdir, f, path)
+ install_manifest.add_pattern_copy(f.srcdir, f, path)
else:
-- install_manifest.add_symlink(f.full_path, dest)
+- install_manifest.add_link(f.full_path, dest)
+ install_manifest.add_copy(f.full_path, dest)
else:
install_manifest.add_optional_exists(dest)