[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
103/115: gnu: meson: Patch to allow installing to independent prefixes.
From: |
guix-commits |
Subject: |
103/115: gnu: meson: Patch to allow installing to independent prefixes. |
Date: |
Fri, 15 Oct 2021 09:49:20 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit ea5033c24629e9e4492dcf389ac41fa504542eaa
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 d131db5..030ad70 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1456,6 +1456,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()
- 62/115: gnu: gst-plugins-good: Update to 1.18.5., (continued)
- 62/115: gnu: gst-plugins-good: Update to 1.18.5., guix-commits, 2021/10/15
- 94/115: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/15
- 95/115: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/15
- 96/115: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/15
- 98/115: gnu: Add python-flit-core., guix-commits, 2021/10/15
- 106/115: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/15
- 112/115: gnu: lsof: Fix indentation., guix-commits, 2021/10/15
- 114/115: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/15
- 111/115: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/15
- 113/115: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/15
- 103/115: gnu: meson: Patch to allow installing to independent prefixes.,
guix-commits <=
- 99/115: gnu: Add python-tomli., guix-commits, 2021/10/15