[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: meson: Update to 0.47.1.
From: |
Ricardo Wurmus |
Subject: |
01/01: gnu: meson: Update to 0.47.1. |
Date: |
Fri, 10 Aug 2018 10:01:18 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit a3baaaa07a77ae03e891ed5b462d0836d8a2a66e
Author: Ricardo Wurmus <address@hidden>
Date: Fri Aug 10 16:00:22 2018 +0200
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.
---
gnu/packages/build-tools.scm | 6 ++--
gnu/packages/patches/meson-for-build-rpath.patch | 36 +++++++++++++-----------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index e693aec..aaae0a0 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2017 Corentin Bocquillon <address@hidden>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Fis Trivial <address@hidden>
@@ -100,7 +100,7 @@ generate such a compilation database.")
(define-public meson
(package
(name "meson")
- (version "0.46.1")
+ (version "0.47.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/"
@@ -108,7 +108,7 @@ generate such a compilation database.")
version ".tar.gz"))
(sha256
(base32
- "0y7f5hhy16q99l7x06x8sid9p9dbg6d7i60zs7c07cz5ww1plj8r"))))
+ "19mdap2ncvczajx220bd73xmwhd8x906382y18cn9c5syxwxwwyn"))))
(build-system python-build-system)
(arguments
`(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
diff --git a/gnu/packages/patches/meson-for-build-rpath.patch
b/gnu/packages/patches/meson-for-build-rpath.patch
index 2151d53..04c07d0 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 <address@hidden>
-
---- 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 <address@hidden>
+Adjusted for Meson 0.47.1 by Ricardo Wurmus <address@hidden>
+--- 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()