From: Maxim Cournoyer <liliana.prikler@gmail.com>
To: 62873@debbugs.gnu.org
Cc: rg@raghavgururajan.name
Subject: [bug#62873] [PATCH gnome-team 3/4] build: meson: Honor bindir, libdir and includedir.
Date: Sat, 8 Apr 2023 10:04:38 -0400 [thread overview]
Message-ID: <43971973ac0be90c50f67b35a59734b8cea1c4c8.camel@gmail.com> (raw)
In-Reply-To: <e2c5a57969bb335e861866c69d372b2ffac040a5.camel@gmail.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2570 bytes --]
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
next prev parent reply other threads:[~2023-04-15 23:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-15 21:39 [bug#62873] [PATCH gnome-team 0/5] Merge master into gnome-team Liliana Marie Prikler
2023-03-27 18:27 ` [bug#62873] [PATCH gnome-team 1/4] gnu: meson: Update to 1.1 Liliana Marie Prikler
2023-04-08 14:04 ` Maxim Cournoyer [this message]
2023-04-08 15:22 ` [bug#62873] [PATCH gnome-team 2/4] build: meson: Explicitly invoke "meson setup" instead of just "meson" Maxim Cournoyer
2023-04-13 13:33 ` [bug#62873] [PATCH gnome-team 4/4] gnu: gtk+-3: Fix build Liliana Marie Prikler
2023-04-15 21:30 ` [bug#62873] [PATCH] Merge branch 'master' into gnome-team Liliana Marie Prikler
2023-04-16 5:47 ` [bug#62873] [PATCH gnome-team 6/6] gnu: gst-plugins-base: Fix build Liliana Marie Prikler
2023-04-18 16:42 ` [bug#62873] [PATCH gnome-team 0/5] Merge master into gnome-team Maxim Cournoyer
2023-04-18 18:30 ` Liliana Marie Prikler
2023-04-20 1:41 ` Maxim Cournoyer
2023-04-30 15:50 ` bug#62873: " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43971973ac0be90c50f67b35a59734b8cea1c4c8.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=62873@debbugs.gnu.org \
--cc=rg@raghavgururajan.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).