aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-08-10 16:00:22 +0200
committerRicardo Wurmus <rekado@elephly.net>2018-08-10 16:01:06 +0200
commita3baaaa07a77ae03e891ed5b462d0836d8a2a66e (patch)
tree807789a268f224025af135616822453781111e9a /gnu/packages/patches
parentbedf0535ff97f7875c5006ed8af1bbd01897c377 (diff)
downloadguix-a3baaaa07a77ae03e891ed5b462d0836d8a2a66e.tar
guix-a3baaaa07a77ae03e891ed5b462d0836d8a2a66e.tar.gz
gnu: meson: Update to 0.47.1.
* gnu/packages/build-tools.scm (meson): Update to 0.47.1. * gnu/packages/patches/meson-for-build-rpath.patch: Adjust.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/meson-for-build-rpath.patch36
1 files changed, 19 insertions, 17 deletions
diff --git a/gnu/packages/patches/meson-for-build-rpath.patch b/gnu/packages/patches/meson-for-build-rpath.patch
index 2151d53565..04c07d05bf 100644
--- a/gnu/packages/patches/meson-for-build-rpath.patch
+++ b/gnu/packages/patches/meson-for-build-rpath.patch
@@ -2,22 +2,24 @@ This patch removes a part of meson that clears the rpath upon installation.
This will only be applied to a special version of meson, used for the
meson-build-system.
-Patch by Peter Mikkelsen <petermikkelsen10@gmail.com>
-
---- meson-0.42.0/mesonbuild/scripts/meson_install.py.orig 2017-09-09 01:49:39.147374148 +0200
-+++ meson-0.42.0/mesonbuild/scripts/meson_install.py 2017-09-09 01:51:01.209134717 +0200
-@@ -391,14 +391,6 @@
- print("Symlink creation does not work on this platform. "
- "Skipping all symlinking.")
- printed_symlink_error = True
-- if os.path.isfile(outname):
-- try:
-- depfixer.fix_rpath(outname, install_rpath, False)
-- except SystemExit as e:
-- if isinstance(e.code, int) and e.code == 0:
-- pass
-- else:
-- raise
+Patch for Meson 0.42.0 by Peter Mikkelsen <petermikkelsen10@gmail.com>
+Adjusted for Meson 0.47.1 by Ricardo Wurmus <rekado@elephly.net>
+--- meson-0.47.1/mesonbuild/minstall.py.old 2018-08-10 11:01:27.812327013 +0200
++++ meson-0.47.1/mesonbuild/minstall.py 2018-08-10 11:01:51.940368505 +0200
+@@ -436,15 +436,6 @@
+ print("Symlink creation does not work on this platform. "
+ "Skipping all symlinking.")
+ printed_symlink_error = True
+- if os.path.isfile(outname):
+- try:
+- depfixer.fix_rpath(outname, install_rpath, final_path,
+- install_name_mappings, verbose=False)
+- except SystemExit as e:
+- if isinstance(e.code, int) and e.code == 0:
+- pass
+- else:
+- raise
+
def run(args):
- global install_log_file
+ parser = buildparser()