From: Peter Mikkelsen <petermikkelsen10@gmail.com>
To: 28444@debbugs.gnu.org
Subject: [bug#28444] [PATCH 2/3] gnu: Add meson-for-build.
Date: Wed, 13 Sep 2017 14:50:02 +0200 [thread overview]
Message-ID: <20170913125003.13313-2-petermikkelsen10@gmail.com> (raw)
In-Reply-To: <20170913125003.13313-1-petermikkelsen10@gmail.com>
* gnu/packages/build-tools.scm (meson-for-build): New variable.
* gnu/packages/patches/meson-for-build-rpath.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/build-tools.scm | 15 +++++++++++++++
gnu/packages/patches/meson-for-build-rpath.patch | 24 ++++++++++++++++++++++++
3 files changed, 40 insertions(+)
create mode 100644 gnu/packages/patches/meson-for-build-rpath.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index c1bc39110..cbf98b6e1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -852,6 +852,7 @@ dist_patch_DATA = \
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
%D%/packages/patches/mesa-skip-disk-cache-test.patch \
%D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \
+ %D%/packages/patches/meson-for-build-rpath.patch \
%D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 5cc0da55d..a5e416db7 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -93,6 +93,21 @@ files}, are written in a custom domain-specific language (DSL) that resembles
Python.")
(license license:asl2.0)))
+(define-public meson-for-build
+ (package
+ (inherit meson)
+ (name "meson-for-build")
+ (version "0.42.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/mesonbuild/meson/"
+ "archive/" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0vyp9rkymzzzilhnf04ryszslyp9a0y0wf4agyijd4w5lcnqlcbc"))
+ (patches (search-patches "meson-for-build-rpath.patch"))))))
+
(define-public premake4
(package
(name "premake")
diff --git a/gnu/packages/patches/meson-for-build-rpath.patch b/gnu/packages/patches/meson-for-build-rpath.patch
new file mode 100644
index 000000000..4e20c9aed
--- /dev/null
+++ b/gnu/packages/patches/meson-for-build-rpath.patch
@@ -0,0 +1,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
+@@ -345,15 +345,6 @@
+ print("Symlink creation does not work on this platform. "
+ "Skipping all symlinking.")
+ printed_symlink_error = True
+- if is_elf_platform() and os.path.isfile(outname):
+- try:
+- e = depfixer.Elf(outname, False)
+- e.fix_rpath(install_rpath)
+- except SystemExit as e:
+- if isinstance(e.code, int) and e.code == 0:
+- pass
+- else:
+- raise
+
+ def run(args):
+ global install_log_file
--
2.14.1
next prev parent reply other threads:[~2017-09-13 12:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-13 12:48 [bug#28444] [PATCH 0/3] Add meson-build-system Peter Mikkelsen
2017-09-13 12:50 ` [bug#28444] [PATCH 1/3] gnu: meson: Update to 0.42.0 Peter Mikkelsen
2017-09-13 12:50 ` Peter Mikkelsen [this message]
2017-09-15 20:57 ` [bug#28444] [PATCH 2/3] gnu: Add meson-for-build Ludovic Courtès
2017-09-15 21:00 ` Peter Mikkelsen
2017-09-13 12:50 ` [bug#28444] [PATCH 3/3] build-system: Add 'meson-build-system' Peter Mikkelsen
2017-09-15 21:07 ` Ludovic Courtès
2017-09-16 11:08 ` Peter Mikkelsen
2017-09-16 16:11 ` bug#28444: " Ludovic Courtès
2017-09-16 17:06 ` [bug#28444] " Peter Mikkelsen
2017-09-17 13:19 ` Ludovic Courtès
2017-09-17 13:24 ` Peter Mikkelsen
2017-09-17 14:01 ` Peter Mikkelsen
2017-09-17 19:21 ` Ludovic Courtès
2017-09-15 20:53 ` [bug#28444] [PATCH 1/3] gnu: meson: Update to 0.42.0 Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170913125003.13313-2-petermikkelsen10@gmail.com \
--to=petermikkelsen10@gmail.com \
--cc=28444@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).