From patchwork Fri Aug 5 03:29:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41934 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 DE64827BBEA; Thu, 25 Aug 2022 08:26:07 +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, SPF_HELO_PASS 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 69C8C27BBE9 for ; Thu, 25 Aug 2022 08:26:07 +0100 (BST) Received: from localhost ([::1]:47552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oR7Fe-000582-Gh for patchwork@mira.cbaines.net; Thu, 25 Aug 2022 03:26:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oR7Ed-0004SM-HL for guix-patches@gnu.org; Thu, 25 Aug 2022 03:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oR7Ed-0006BP-7o for guix-patches@gnu.org; Thu, 25 Aug 2022 03:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oR7Ec-0000Aw-Ud for guix-patches@gnu.org; Thu, 25 Aug 2022 03:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH v3 1/7] gnu: Parameterize libgccjit. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Aug 2022 07:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.1661412276569 (code B ref 57086); Thu, 25 Aug 2022 07:25:02 +0000 Received: (at 57086) by debbugs.gnu.org; 25 Aug 2022 07:24:36 +0000 Received: from localhost ([127.0.0.1]:48742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR7EC-00008z-0F for submit@debbugs.gnu.org; Thu, 25 Aug 2022 03:24:36 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:46647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR7E7-00008M-NJ for 57086@debbugs.gnu.org; Thu, 25 Aug 2022 03:24:34 -0400 Received: by mail-ej1-f66.google.com with SMTP id bj12so20773017ejb.13 for <57086@debbugs.gnu.org>; Thu, 25 Aug 2022 00:24:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc; bh=xExx3NulTbpca/TdIsdqSswbttaIPCfLC7LAFyjEI9o=; b=QKP7WqliXlT2Oq6kDXStWGLY/riVBESVfJUnZjT2m5MNg1Xzkn03Wn7OvQK40YKAjL DduPmcBM3RmnUR533H98d1TBATsunTGJStcYa8G0E9MxyYOjXv88BVRz2s3dXsbMy/ep fTWSs4fMmLfkXTIdqxw+SH7w1pPSD6UBmvd9fNBRRQe/T+PAfjqHJss2dBpxBEIvQW0S kxxwTtH7Fkm6628ZYCQHANXjuZ7lV8mG/oYBQc2iJ1fU/7ul+OuT44W6wBv46pm+MSkZ IL4XJETa0cfa4HUfrLLgO1WXNqxAQSxaoHZutSMdoB4Q19/PTSgyFnb3KUpR/zY8Hpg8 LUmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc; bh=xExx3NulTbpca/TdIsdqSswbttaIPCfLC7LAFyjEI9o=; b=xF/d4BecPigp3g1UtRp7oTKILopi29H4auWL+OOsxTBZDYngUMfBbs92D/zLggXMQ+ Eh9pj2jfjcqA8pkzRiP3Z91wZlm+AmQa5pjeCFusSmpWQvTgOdywoGiYcAcJsczo0MyR ggFcSiozXWCrvwYcAxVcnQcq8N70xdSenPnzSEkv+ikOV/tZNpsJZPMAyaJ8Sm52d9sS bQiyzp1Q6/BiOvMKU7bMsnDsfUcfTuBSnEE4I7Cul5qD6E+CV+mDUNMMCmAI8DlHiNLC 90h2ws4pOEeoOXWvJHhS9Ga0BYOYZgEfNEKss1XculbvC4UxRwsA6Ly1ACCnX8zVi/d9 Fi9A== X-Gm-Message-State: ACgBeo313yHnPITRUwiYC37jjxcPIZ80qDqO8TJBrk+PmhbUMgllDDE6 zDIJIFdFsGx/wSkQK5tF0NkWaT/wM+Q= X-Google-Smtp-Source: AA6agR5M+2A2bKaXsCxwXUTUmdo8/0MsX/TGUXL+CSceW11PwK19BBvCC9wgdNSSZ9jnkFGr0fwQHw== X-Received: by 2002:a17:907:2bd1:b0:73d:d154:8e42 with SMTP id gv17-20020a1709072bd100b0073dd1548e42mr1027026ejc.585.1661412266157; Thu, 25 Aug 2022 00:24:26 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g2-20020a170906538200b0073d62cc3270sm2019690ejo.118.2022.08.25.00.24.24 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 00:24:24 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 5 Aug 2022 05:29:58 +0200 Message-ID: <851f9ca3194c6b3c810d4c44fbd500072bda5de6.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gcc.scm (make-libgccjit): New variable. (libgccjit): Define in terms of make-libgccjit. --- gnu/packages/gcc.scm | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4c496e31b2..66f0766646 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -968,31 +968,33 @@ (define-public gdc-11 (custom-gcc gcc-11 "gdc" '("d") %generic-search-paths))) -(define-public libgccjit +(define-public (make-libgccjit gcc) (package - (inherit gcc-9) + (inherit gcc) (name "libgccjit") (outputs (delete "lib" (package-outputs gcc))) (properties (alist-delete 'hidden? (package-properties gcc))) (arguments - (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 regex) - (srfi srfi-1) - (srfi srfi-26)) - ,@(package-arguments gcc)) + (substitute-keyword-arguments (package-arguments gcc) + ((#:modules _ '()) + '((guix build gnu-build-system) + (guix build utils) + (ice-9 regex) + (srfi srfi-1) + (srfi srfi-26))) ((#:configure-flags flags) - `(append `("--enable-host-shared" - ,(string-append "--enable-languages=jit")) + #~(cons* "--enable-host-shared" + "--enable-languages=jit" (remove (cut string-match "--enable-languages.*" <>) - ,flags))) + #$flags))) ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files - (lambda* (#:key outputs #:allow-other-keys) - (for-each delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))) + #~(modify-phases #$phases + (add-after 'install 'remove-broken-or-conflicting-files + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file + (find-files + (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))) (synopsis "GCC library generating machine code on-the-fly at runtime") (description "This package is part of the GNU Compiler Collection and provides an @@ -1003,6 +1005,8 @@ (define-public libgccjit compilers. The just-in-time (jit) part of the name is now something of a misnomer."))) +(define-public libgccjit (make-libgccjit gcc-9)) + (define (make-gccgo gcc) "Return a gccgo package based on GCC." (let ((gccgo (custom-gcc gcc "gccgo" '("go") %generic-search-paths)))