[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
102/140: gnu: meson: Patch to allow installing to independent prefixes.
From: |
guix-commits |
Subject: |
102/140: gnu: meson: Patch to allow installing to independent prefixes. |
Date: |
Sun, 17 Oct 2021 23:11:06 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 57f18af239076a9456624df5e6ddf3f82ea2a925
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 caeb6f9..8db93c6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1455,6 +1455,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()
- 88/140: guix: packages: Fix repacking of plain tarballs., (continued)
- 88/140: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/17
- 89/140: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/17
- 90/140: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/17
- 97/140: gnu: Add python-flit-core., guix-commits, 2021/10/17
- 95/140: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/17
- 92/140: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/17
- 87/140: gnu: gdb: Normalize indentation., guix-commits, 2021/10/17
- 93/140: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/17
- 98/140: gnu: Add python-tomli., guix-commits, 2021/10/17
- 100/140: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/17
- 102/140: gnu: meson: Patch to allow installing to independent prefixes.,
guix-commits <=
- 104/140: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/17
- 105/140: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/17
- 107/140: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/17
- 108/140: gnu: lsof: Fix indentation., guix-commits, 2021/10/17
- 116/140: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/17
- 114/140: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/17
- 115/140: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/17
- 117/140: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/17
- 120/140: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/17
- 126/140: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/17