From patchwork Sat Apr 8 14:04:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49183 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8D842175BC; Sat, 15 Apr 2023 23:36:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 442B31759E for ; Sat, 15 Apr 2023 23:36:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnoV3-0000za-T1; Sat, 15 Apr 2023 18:36:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnoV1-0000yC-95 for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnoV1-0002pP-1G for guix-patches@gnu.org; Sat, 15 Apr 2023 18:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnoV0-00083T-Tg; Sat, 15 Apr 2023 18:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62873] [PATCH gnome-team 3/4] build: meson: Honor bindir, libdir and includedir. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 15 Apr 2023 22:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62873@debbugs.gnu.org Cc: rg@raghavgururajan.name X-Debbugs-Original-Xcc: rg@raghavgururajan.name Received: via spool by 62873-submit@debbugs.gnu.org id=B62873.168159813430897 (code B ref 62873); Sat, 15 Apr 2023 22:36:02 +0000 Received: (at 62873) by debbugs.gnu.org; 15 Apr 2023 22:35:34 +0000 Received: from localhost ([127.0.0.1]:50275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUX-00082G-EO for submit@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:33 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:38763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnoUR-00081M-On for 62873@debbugs.gnu.org; Sat, 15 Apr 2023 18:35:28 -0400 Received: by mail-ej1-f67.google.com with SMTP id fw30so1928751ejc.5 for <62873@debbugs.gnu.org>; Sat, 15 Apr 2023 15:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681598122; x=1684190122; h=mime-version:message-id:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=yTpG3ZXu18/pl3Xe2qYi66h61ZE31nncurx6U/ybApM=; b=btLKxLZOsvbsmowKhWJctEp73CKQv9trR76q7mb+8UnasM1Cjnz6F/UAr/RtKPg8Hj Rke9E1JZ+d8py6qVQbS/9eTQFk0NCru0wUbqOhWMTzOo+Xw2LywLRseAEuaeWNX9tgxZ gg23oJk8o2uyYP34eiWbcCl60CSDoHrNUdRC3DOBacdnRfDK3/6CBonxQbiDjYCrSRBW urclcxrU3s8pHTvJV3Xsw6zXZxM+WmzTxKPzJ0tm1PuQ9FWhv6ZfUAXGLnFk+NuGU8gg 0PTFY4ItGL80pCUJ458+3tE1qgx+2ppDAznmNxfw5l04tge3vYSEgukHyxDx7g+tRf3z EFMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681598122; x=1684190122; h=mime-version:message-id:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=yTpG3ZXu18/pl3Xe2qYi66h61ZE31nncurx6U/ybApM=; b=dRPqiI3Uu+2ZkEXSNwI+1Tft+Ebz/a2wmUY3ZbJgNxOEFOptw42RHBCFMI/e9OsqVg wHZRZ2TgihWwJbZV/MCfilfeUQM/cjVxpDF4T8xnPjn3GvgC8tGj3F7KZ0ZB0zTs9Zqi Muzc+b8voQ3AfnR96myC2gOjL28ohczwGhe6oQQ/UUn64+BWe86ac6PWtwlqY3JbR34Z RkixaRv9eaNBhkYw+1wEUmXaL9kSUMnILugoEAsfz1S+cSw6RlwUjxXG5LjN3VyQBfy/ lsXOTlfoJTk2LC9uaRNtw79ik9AJFH8bwEFGNAlwAU9T/PyftY4EI1bCdOOF/NUDS9ry 8YLQ== X-Gm-Message-State: AAQBX9caskguUdOVj+gRP88LnlQ6v7Xy5Kyg6HtI2K4MQhywG6UlpUL9 tFIZPuzpfjIBh2j6c0cY3ihj3/3tQMD/DQ== X-Google-Smtp-Source: AKy350Yjr6oFM56SOJUu8Cf0nt5VE7GfiIaHiDSrKhjVoFGcOJRw2eFZ/u+kygm24czSVnk1SdU4Pw== X-Received: by 2002:a17:906:3e03:b0:94e:4489:f24d with SMTP id k3-20020a1709063e0300b0094e4489f24dmr3004555eji.61.1681598122095; Sat, 15 Apr 2023 15:35:22 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg16-20020a170907205000b0094a85f6074bsm4306035ejb.33.2023.04.15.15.35.21 for <62873@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 15:35:21 -0700 (PDT) From: Maxim Cournoyer X-Google-Original-From: Maxim Cournoyer Date: Sat, 8 Apr 2023 10:04:38 -0400 Message-ID: <43971973ac0be90c50f67b35a59734b8cea1c4c8.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 --- 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 ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Marius Bakke -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; ;;; 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")