[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/13: build: meson: Honor bindir, libdir and includedir.
From: |
guix-commits |
Subject: |
10/13: build: meson: Honor bindir, libdir and includedir. |
Date: |
Sun, 9 Apr 2023 12:57:16 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 9bf0a6e4a87c76852c3115476f76056434886181
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Apr 8 10:04:38 2023 -0400
build: meson: Honor bindir, libdir and includedir.
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.
---
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 61ce45367d..d8d17e00e8 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 @@
#: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")
- branch core-updates updated (03580b5f1d -> 2bde53c594), guix-commits, 2023/04/09
- 05/13: gnu: dconf-editor: Update to 43.0., guix-commits, 2023/04/09
- 04/13: gnu: gnome-screenshot: Update to 41.0-0.9f067cf., guix-commits, 2023/04/09
- 07/13: gnu: authenticator: Patch to build with a recent meson., guix-commits, 2023/04/09
- 11/13: build: meson: Explicitly invoke "meson setup" instead of just "meson"., guix-commits, 2023/04/09
- 01/13: gnu: Remove extraneous #:meson build arguments., guix-commits, 2023/04/09
- 08/13: gnu: gnome-mahjongg: Update to 3.38.3-0.e9e73e5., guix-commits, 2023/04/09
- 10/13: build: meson: Honor bindir, libdir and includedir.,
guix-commits <=
- 03/13: gnu: libnice: Update to 0.1.21., guix-commits, 2023/04/09
- 02/13: gnu: gnome-user-share: Update to 43.0., guix-commits, 2023/04/09
- 09/13: gnu: libcacard: Use latest meson., guix-commits, 2023/04/09
- 06/13: gnu: gnome-disk-utility: Update to 44.0., guix-commits, 2023/04/09
- 12/13: gnu: meson: Update to 1.0.1., guix-commits, 2023/04/09
- 13/13: gnu: gtk: Do not manually move /bin., guix-commits, 2023/04/09