[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/21: build-system/meson: Add the output directory to RUNPATH.
From: |
Marius Bakke |
Subject: |
04/21: build-system/meson: Add the output directory to RUNPATH. |
Date: |
Mon, 12 Mar 2018 13:22:33 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 09a45ffb146fda75b87f89c729c31d1da5bf93da
Author: Marius Bakke <address@hidden>
Date: Fri Mar 9 17:30:22 2018 +0100
build-system/meson: Add the output directory to RUNPATH.
* guix/build/meson-build-system.scm (configure): Set LDFLAGS before
invoking meson.
---
guix/build/meson-build-system.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/guix/build/meson-build-system.scm
b/guix/build/meson-build-system.scm
index 2b92240..e8cb544 100644
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@ -46,6 +46,15 @@
,(string-append "--buildtype=" build-type)
,@configure-flags
,source-dir)))
+
+ ;; Meson lacks good facilities for dealing with RUNPATH, so we
+ ;; add the output "lib" directory here to avoid doing that in
+ ;; many users. Related issues:
+ ;; * <https://github.com/mesonbuild/meson/issues/314>
+ ;; * <https://github.com/mesonbuild/meson/issues/3038>
+ ;; * <https://github.com/NixOS/nixpkgs/issues/31222>
+ (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
+
(mkdir build-dir)
(chdir build-dir)
(zero? (apply system* "meson" args))))
- branch staging updated (d8fa189 -> 5413074), Marius Bakke, 2018/03/12
- 03/21: gnu: meson: Update to 0.45.0., Marius Bakke, 2018/03/12
- 02/21: gnu: meson-for-build: Update to 0.44.0., Marius Bakke, 2018/03/12
- 08/21: gnu: xf86-input-wacom: Update to 0.36.0., Marius Bakke, 2018/03/12
- 01/21: gnu: meson: Don't wrap the meson executable., Marius Bakke, 2018/03/12
- 04/21: build-system/meson: Add the output directory to RUNPATH.,
Marius Bakke <=
- 18/21: gnu: libdrm: Update to 2.4.91., Marius Bakke, 2018/03/12
- 07/21: gnu: libwacom: Update to 0.29., Marius Bakke, 2018/03/12
- 11/21: gnu: xkbcomp: Update to 1.4.1., Marius Bakke, 2018/03/12
- 09/21: gnu: libical: Update to 3.0.3., Marius Bakke, 2018/03/12
- 10/21: gnu: libxshmfence: Update to 1.3., Marius Bakke, 2018/03/12
- 13/21: gnu: nss, nss-certs: Update to 3.36., Marius Bakke, 2018/03/12
- 17/21: gnu: alsa-plugins: Update to 1.1.5., Marius Bakke, 2018/03/12
- 16/21: gnu: alsa-utils: Update to 1.1.5., Marius Bakke, 2018/03/12
- 05/21: build-system/meson: Skip the 'fix-runpath' phase on armhf., Marius Bakke, 2018/03/12
- 14/21: gnu: bluez: Update to 5.49., Marius Bakke, 2018/03/12