[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
102/201: gnu: meson: Patch to allow installing to independent prefixes.
From: |
guix-commits |
Subject: |
102/201: gnu: meson: Patch to allow installing to independent prefixes. |
Date: |
Mon, 1 Nov 2021 23:18:49 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 40f8cb4a1a636cb044d535ed77fc78347158fa2a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Oct 7 14:54:08 2021 -0400
gnu: meson: Patch to allow installing to independent prefixes.
Meson goes to lengths at preventing installation to directories outside of
the
main installation prefix. This isn't convenient or desirable in Guix; patch
it out using a patch maintained by Nix.
* gnu/packages/patches/meson-allow-dirs-outside-of-prefix.patch: Add patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/build-tools.scm (meson): Use it.
---
gnu/local.mk | 1 +
gnu/packages/build-tools.scm | 4 +++-
.../patches/meson-allow-dirs-outside-of-prefix.patch | 20 ++++++++++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 7cb60ad..954527b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1470,6 +1470,7 @@ dist_patch_DATA =
\
%D%/packages/patches/mesa-opencl-all-targets.patch \
%D%/packages/patches/mesa-skip-tests.patch \
%D%/packages/patches/mescc-tools-boot.patch \
+ %D%/packages/patches/meson-allow-dirs-outside-of-prefix.patch \
%D%/packages/patches/metabat-fix-compilation.patch \
%D%/packages/patches/mhash-keygen-test-segfault.patch \
%D%/packages/patches/minetest-add-MINETEST_MOD_PATH.patch \
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index c92fe0b..a02d1a7 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -272,7 +272,9 @@ files and generates build instructions for the Ninja build
system.")
version ".tar.gz"))
(sha256
(base32
- "0v9m0bazhj48kwc8x3gkxg5c3kcvknvqfjlq22z6pm2h2r2nln6v"))))
+ "0v9m0bazhj48kwc8x3gkxg5c3kcvknvqfjlq22z6pm2h2r2nln6v"))
+ (patches (search-patches
+ "meson-allow-dirs-outside-of-prefix.patch"))))
(build-system python-build-system)
(arguments
`(;; FIXME: Tests require many additional inputs and patching many
diff --git a/gnu/packages/patches/meson-allow-dirs-outside-of-prefix.patch
b/gnu/packages/patches/meson-allow-dirs-outside-of-prefix.patch
new file mode 100644
index 0000000..f16daa8
--- /dev/null
+++ b/gnu/packages/patches/meson-allow-dirs-outside-of-prefix.patch
@@ -0,0 +1,20 @@
+Source:
https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
+--- a/mesonbuild/coredata.py
++++ b/mesonbuild/coredata.py
+@@ -506,7 +506,6 @@ class CoreData:
+ return value
+ if option.name.endswith('dir') and value.is_absolute() and \
+ option not in BULITIN_DIR_NOPREFIX_OPTIONS:
+- # Value must be a subdir of the prefix
+ # commonpath will always return a path in the native format, so we
+ # must use pathlib.PurePath to do the same conversion before
+ # comparing.
+@@ -518,7 +517,7 @@ class CoreData:
+ try:
+ value = value.relative_to(prefix)
+ except ValueError:
+- raise MesonException(msg.format(option, value, prefix))
++ pass
+ if '..' in str(value):
+ raise MesonException(msg.format(option, value, prefix))
+ return value.as_posix()
- 81/201: build: qt-utils: Don't wrap .X-real files., (continued)
- 81/201: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/11/01
- 89/201: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/11/01
- 83/201: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/11/01
- 92/201: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/11/01
- 94/201: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/11/01
- 97/201: gnu: Add python-flit-core., guix-commits, 2021/11/01
- 103/201: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/11/01
- 106/201: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/11/01
- 107/201: gnu: lsof: Disable the LTlock test., guix-commits, 2021/11/01
- 105/201: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/11/01
- 102/201: gnu: meson: Patch to allow installing to independent prefixes.,
guix-commits <=
- 111/201: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/11/01
- 115/201: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/11/01
- 130/201: gnu: webkitgtk: Update to 2.34.1., guix-commits, 2021/11/01
- 122/201: gnu: heimdal: Fix build., guix-commits, 2021/11/01
- 133/201: gnu: python-flit: Update to 3.3.0., guix-commits, 2021/11/01
- 149/201: gnu: meson: Update to 0.60.0., guix-commits, 2021/11/01
- 158/201: gnu: gdk-pixbuf: Remove obsolete jasper support., guix-commits, 2021/11/01
- 200/201: gnu: gvfs: Use meson-0.59 to workaround faulty meson., guix-commits, 2021/11/01
- 183/201: gnu: jami-gnome: Fix build with webkitgtk 2.34.1., guix-commits, 2021/11/01
- 185/201: gnu: uhttpmock: Use libsoup 2., guix-commits, 2021/11/01