From patchwork Fri Sep 29 09:16:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54403 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 9B1BE27BBEA; Fri, 29 Sep 2023 10:19:11 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 411D127BBE2 for ; Fri, 29 Sep 2023 10:19:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dr-0005wn-SZ; Fri, 29 Sep 2023 05:18:36 -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 1qm9dI-0005W5-Ny for guix-patches@gnu.org; Fri, 29 Sep 2023 05:18:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qm9dF-0003w3-EW for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dS-0004oC-JN; Fri, 29 Sep 2023 05:18:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 22/23] guix: meson-build-system: Disable PIC for AVR. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 29 Sep 2023 09:18:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66263@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , efraim@flashner.co.il, vagrant@debian.org, maxim.cournoyer@gmail.com X-Debbugs-Original-Xcc: efraim@flashner.co.il, vagrant@debian.org, maxim.cournoyer@gmail.com Received: via spool by 66263-submit@debbugs.gnu.org id=B66263.169597907418248 (code B ref 66263); Fri, 29 Sep 2023 09:18:10 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:54 +0000 Received: from localhost ([127.0.0.1]:55226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9d5-0004k2-VO for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:54 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:57841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cd-0004gT-QO for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40535597f01so140505595e9.3 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979019; x=1696583819; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FyAGWA1iVJ69KfccThZICbnx6k2dV4sBFRV49qBPGoc=; b=itNQh3bRfNooor5HZq6yPw1ha9V2uiXNB+8bQ+rH4aDPbb+x94dORHHphvIJxW2EEd vj22g18jiyKbZyjfywmfyzO997f3VqUn9hQ/9v/RAMEdZ5S8CoIJEEX5BL2f0XT10gPJ 9xLJdFHhQJltAElRNpLkGuXZ1/8PWaIUsXaDAaiuG3Z89KZdn5Q8tYoNqt810MKEx+VW 7SMt1IF+mwyn/uYTWWiLRBGpxv+LqrpQdOHxqNOyXpjWPfDITbVRYurM55z4uip98N65 FlG+e1+VKWZqwePZsB3+hu7f9O+15oGL9P0WZt4AT4xbSWzA3BcykAGkk0DP1i9eacYp ckJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979019; x=1696583819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FyAGWA1iVJ69KfccThZICbnx6k2dV4sBFRV49qBPGoc=; b=MQoIZ61upweA4X3jt77Kizb/S3Fu5ZX1EeoCjRiZBlzqv3RVBhw7v7Wn/fpO7qPyUA 7TjuaXekr4xqhzNd/NOOX0/RFOcIKorNqP1DRBbkGAgCWqLbH7quhpq1zkm7DllIS0Fe /++kOH+6KCBv772rkUVzLUjkLdglGutGVw7Bv1WruA6s3BBUZA/pREo9PeNKcxEPPUat uJryRbuP5tITPKzTHI9oWN0PrYC57j6mHzs1bh9PH85Z7woEa7D5Vd424rMClAMvOvmV vjnOZt4KC/dHPz1eTbEc8782tJgDJKQIykj746/OGDBJA3+2kcnMXIK+7MGImkvwfHir gh6Q== X-Gm-Message-State: AOJu0YxwkEUzG6gPc3uqwNKCDoBqHSWYG/mUAoX2EzMLJ/nFmS9qRebe a9knmbc1SIqYxrixKXrYvCHvOHKRkUB1JVRq3G25lw== X-Google-Smtp-Source: AGHT+IHhh5SyTrtxTuqQNqbiPWVfSRnYiQaTz3PulgsYT6zyCOigpqEVg+wAJL7bXlMUpDMLx82hMw== X-Received: by 2002:a05:600c:4750:b0:406:54e4:359c with SMTP id w16-20020a05600c475000b0040654e4359cmr3184269wmo.19.1695979019213; Fri, 29 Sep 2023 02:16:59 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id k15-20020a7bc40f000000b004013797efb6sm1020933wmi.9.2023.09.29.02.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:58 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:26 +0200 Message-Id: <20230929091627.7820-22-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929091627.7820-1-jean@foundationdevices.com> References: <20230929091627.7820-1-jean@foundationdevices.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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ 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 * guix/build-system/meson.scm (make-built-in-options-alist): New variable. * guix/build-system/meson.scm (make-cross-file): Add 'built-in options' section to cross file. --- guix/build-system/meson.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index b894789fb8..92e47285d6 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -92,6 +92,13 @@ (define (make-binaries-alist triplet) (ld . ,(string-append triplet "-ld")) (strip . ,(string-append triplet "-strip")))) +(define (make-built-in-options-alist triplet) + (if (target-avr? triplet) + `((b_pie . #f) + (b_staticpic . #f) + (default_library . "static")) + '())) + (define (make-cross-file triplet) (computed-file "cross-file" (with-imported-modules '((guix build meson-configuration)) @@ -102,7 +109,9 @@ (define (make-cross-file triplet) (write-section-header port "host_machine") (write-assignments port '#$(make-machine-alist triplet)) (write-section-header port "binaries") - (write-assignments port '#$(make-binaries-alist triplet)))))))) + (write-assignments port '#$(make-binaries-alist triplet)) + (write-section-header port "built-in options") + (write-assignments port '#$(make-built-in-options-alist triplet)))))))) (define %meson-build-system-modules ;; Build-side modules imported by default.