[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62873] [PATCH gnome-team 3/4] build: meson: Honor bindir, libdir an
From: |
Maxim Cournoyer |
Subject: |
[bug#62873] [PATCH gnome-team 3/4] build: meson: Honor bindir, libdir and includedir. |
Date: |
Sat, 8 Apr 2023 10:04:38 -0400 |
This brings our meson-build-system closer to our gnu-build-system in terms of
using different installation prefixes based on the presence of outputs such as
"bin", "lib" or "include".
* guix/build/meson-build-system.scm (configure): Add --bindir, --libdir and
--includedir according to the presence of the "bin", "lib" and "include"
outputs, as done in gnu-build-system.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
guix/build/meson-build-system.scm | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/guix/build/meson-build-system.scm
b/guix/build/meson-build-system.scm
index 3d1a27cba7..d11a5d8e18 100644
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,10 +41,28 @@ (define* (configure #:key outputs configure-flags build-type
#:allow-other-keys)
"Configure the given package."
(let* ((out (assoc-ref outputs "out"))
+ (bindir (assoc-ref outputs "bin"))
+ (libdir (assoc-ref outputs "lib"))
+ (includedir (assoc-ref outputs "include"))
(source-dir (getcwd))
(build-dir "../build")
(prefix (assoc-ref outputs "out"))
(args `(,(string-append "--prefix=" prefix)
+ ,@(if bindir
+ (list (string-append "--bindir=" bindir "/bin"))
+ '())
+ ,@(if libdir
+ (cons (string-append "--libdir=" libdir "/lib")
+ (if includedir
+ '()
+ (list
+ (string-append "--includedir="
+ libdir "/include"))))
+ '())
+ ,@(if includedir
+ (list (string-append "--includedir="
+ includedir "/include"))
+ '())
,(string-append "--buildtype=" build-type)
,(string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref outputs "out") "/lib")
--
2.39.2
- [bug#62873] [PATCH gnome-team 0/5] Merge master into gnome-team, Liliana Marie Prikler, 2023/04/15
- [bug#62873] [PATCH gnome-team 3/4] build: meson: Honor bindir, libdir and includedir.,
Maxim Cournoyer <=
- [bug#62873] [PATCH gnome-team 2/4] build: meson: Explicitly invoke "meson setup" instead of just "meson"., Maxim Cournoyer, 2023/04/15
- [bug#62873] [PATCH gnome-team 1/4] gnu: meson: Update to 1.1., Liliana Marie Prikler, 2023/04/15
- [bug#62873] [PATCH gnome-team 4/4] gnu: gtk+-3: Fix build., Liliana Marie Prikler, 2023/04/15
- [bug#62873] [PATCH] Merge branch 'master' into gnome-team., Liliana Marie Prikler, 2023/04/15
- [bug#62873] [PATCH gnome-team 6/6] gnu: gst-plugins-base: Fix build., Liliana Marie Prikler, 2023/04/16
- bug#62873: [PATCH gnome-team 0/5] Merge master into gnome-team, Liliana Marie Prikler, 2023/04/30