From patchwork Thu Jan 18 00:24:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 59081 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 0E44B27BBEA; Thu, 18 Jan 2024 00:25:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 1ABAE27BBE9 for ; Thu, 18 Jan 2024 00:25:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQGDR-0006mf-Ez; Wed, 17 Jan 2024 19:25:05 -0500 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 1rQGDN-0006mJ-Jt for guix-patches@gnu.org; Wed, 17 Jan 2024 19:25:01 -0500 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 1rQGDN-0003YD-2C; Wed, 17 Jan 2024 19:25:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQGDN-0007Kf-Ry; Wed, 17 Jan 2024 19:25:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68554] [PATCH 1/3] gnu: Add gdc alias. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 00:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68554 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68554@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68554-submit@debbugs.gnu.org id=B68554.170553749828163 (code B ref 68554); Thu, 18 Jan 2024 00:25:01 +0000 Received: (at 68554) by debbugs.gnu.org; 18 Jan 2024 00:24:58 +0000 Received: from localhost ([127.0.0.1]:53980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQGDJ-0007KA-TD for submit@debbugs.gnu.org; Wed, 17 Jan 2024 19:24:58 -0500 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:43452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQGDH-0007Jt-RP for 68554@debbugs.gnu.org; Wed, 17 Jan 2024 19:24:56 -0500 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-680b1335af6so1765216d6.1 for <68554@debbugs.gnu.org>; Wed, 17 Jan 2024 16:24:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705537488; x=1706142288; 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=xxkjN0KW/hEK2L2ysmylkewzmf2Af2ppdger5Y/5b/o=; b=HYK6egOYLVDSrUumbhrBoRflZ2/cU3bC603Otm2YrY23N2fpBmPP2e59+ocQ9pLZbT 5+EvnIdmzeh+d4u7PT/k7X5jbNOzViT8wVUYNtELDpl6uKp/xKln89ttxtBjDUZeD6il 3YOohkAWj8sCN5VBvavEsEuPyshrYC++QqMwo9yDB6VF4ksa21wXqnEeSUOx7UswF5KQ 1dv0MSPKFOQ7IIxdDomh2//7JH2ymNJj7rSMuxcNfdT1H7pVt3NKBjXqDejeD0c1PVHK 8e208IeAz+mzgY1GkvULlrjdSBmLGJZU2I7MFDm2vyu4OJB35+cn38WwzwzYfJfX4Lfw mJVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705537488; x=1706142288; 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=xxkjN0KW/hEK2L2ysmylkewzmf2Af2ppdger5Y/5b/o=; b=xKRfl6hs9geX7GjGDv55CLUBvnOpN9fJDA6fSfiv/OFvj/sAY8kGORmmnwN++lvTqM tlvt+OteAqwpUfLC4BrcJ22TQjD5u+o3itObCSVydAMKyu08iuWY0ZGrsd6Jdo896lQ4 +S2htFQ501CblL9TLRxbN7jpOmuXJUaBnVeVfykig0fA4yRpAn4Rlryp/gUyz+WlN9vG r6yx1P8Yxow7PZlxo1Ini3mC4+9flICSnZvvwgaXgIC5KcxEzr7rxcVEqJz3K4O5wIBF tEasdTLRJVmR5buHP6lf4PbDqTLaRJ6oDqexOmHPvaQpZezmLKhgTPewRc6t9zVam2iD wgxA== X-Gm-Message-State: AOJu0YwjO5sWGf0OarbQ/deutel+njpalY/xqJll/w8pQ8D1LaFIAuvE Q80Z7TkhLPp/mzQ/xoa0fNRu05nhNMLyFEJMfMt5ndoZ7n9CbIuYUInsPcE18KA= X-Google-Smtp-Source: AGHT+IFKPb+wJCP7PQJ3yPwqRNKiZgTZDVReYnMTRztqEeUB2G3unmrTSaKXir7qdsm5tO9MFl9lDQ== X-Received: by 2002:a05:6214:c8b:b0:681:78e0:505e with SMTP id r11-20020a0562140c8b00b0068178e0505emr2387358qvr.41.1705537488441; Wed, 17 Jan 2024 16:24:48 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-147.b2b2c.ca. [72.10.141.147]) by smtp.gmail.com with ESMTPSA id m15-20020ad4448f000000b0068176e0cf05sm1446092qvt.41.2024.01.17.16.24.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 16:24:47 -0800 (PST) From: Maxim Cournoyer Date: Wed, 17 Jan 2024 19:24:31 -0500 Message-ID: <19107cbb887ce52888d6ecfef6ff64ee5ed5952f.1705531163.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/gcc.scm (gdc): New variable. Change-Id: I38447e46ffba44d3a9d3757d34fe9ff081803457 --- gnu/packages/gcc.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5590cd3d7e..3ee7afb97f 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1118,6 +1118,12 @@ (define-public gdc-11 (custom-gcc gcc-11 "gdc" '("d") %generic-search-paths))) +;;; Alias tracking the latest GDC version. +(define-public gdc + (hidden-package + (custom-gcc gcc "gdc" '("d") + %generic-search-paths))) + (define-public (make-libgccjit gcc) (package (inherit gcc) From patchwork Thu Jan 18 00:24:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 59082 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 6E29A27BBEA; Thu, 18 Jan 2024 00:26:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 0783A27BBE2 for ; Thu, 18 Jan 2024 00:26:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQGEM-0006z3-2n; Wed, 17 Jan 2024 19:26:02 -0500 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 1rQGEK-0006xi-Na for guix-patches@gnu.org; Wed, 17 Jan 2024 19:26:00 -0500 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 1rQGEK-0003zB-FU for guix-patches@gnu.org; Wed, 17 Jan 2024 19:26:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQGEL-0007N0-Mv; Wed, 17 Jan 2024 19:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68554] [PATCH 2/3] gnu: gdmd: Replace gdc-11 with gdc alias. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 00:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68554 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68554@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 68554-submit@debbugs.gnu.org id=B68554.170553750228212 (code B ref 68554); Thu, 18 Jan 2024 00:26:01 +0000 Received: (at 68554) by debbugs.gnu.org; 18 Jan 2024 00:25:02 +0000 Received: from localhost ([127.0.0.1]:53985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQGDO-0007Kn-7u for submit@debbugs.gnu.org; Wed, 17 Jan 2024 19:25:02 -0500 Received: from mail-ua1-x92b.google.com ([2607:f8b0:4864:20::92b]:61547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQGDK-0007K0-OH for 68554@debbugs.gnu.org; Wed, 17 Jan 2024 19:24:59 -0500 Received: by mail-ua1-x92b.google.com with SMTP id a1e0cc1a2514c-7ce6c3dab88so2952391241.2 for <68554@debbugs.gnu.org>; Wed, 17 Jan 2024 16:24:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705537491; x=1706142291; 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=iA0HfxKm6N/Zk5oDg7o90eiorov8MpERSN0NwwXUGmw=; b=T9/GO2Jl4yY1qOUV76DERu2OJwdoJ08C3rXamYhs0SB1scCegCX8k3rm7fWYPPWoKY XY62+JRObaNKC7V+IHI7luPbhA/hW3AiDUXneOM+S3xs4730rqqb5Eqxhdacw1IkzG7z 9/6QqWdoQKYxVQIi/Bhgn7DRRSXnM9507p+dJQKEulVYB1UhyoMxUqUbkEiYF+nV8Gux X3SHKYfdiAVgQPwPXHSdlL74wSkx1os4Kx+ARIBUQJctAjbfHwYLKsp0oRM9jgFI0ucq J4MPRqfRxZbktv/oPTR2VgFPs1/F0CdrCWKDBC+EvXLkWcb/zAePr6rv5NVYHZ3YGjpU EhtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705537491; x=1706142291; 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=iA0HfxKm6N/Zk5oDg7o90eiorov8MpERSN0NwwXUGmw=; b=pr0THGLqMkYFp5K9PuevEboQzU3I+jEkt6utet5r8ERg87ppgv+fSv5YoE3tP/5BYX 7OkYQk3VE8WS1Mx/RmXGkqG9abOvYiL+S4Lxg0d1c99lSVcy4E0yyddvcmiqpciTls+H /AzI3b0ctLJuBMdTObixcozVQqcr14yZyM3RpsPRoUu8HbpL7DLiZbNk5WvT/yvV9f/c uEmjnRaLlAqYz0YAAIZC6yQE4A24U4E4HIRWuzuMaxbxOSqulA/Vnrv3jwElrMQ0WcRp pC2R0wAAq7DzCDyqCeAmVGsB4ClQUMPdBO2bTh2Rzk+CO77LhtxGBaxsMFqH7hhjoGqj H0Vw== X-Gm-Message-State: AOJu0YxeDrKT9WhzWBklblmkllsRMdlCK6Hf5DiA+quW7NfG+EpJl3NX b2Bxq8wE3UQAnanzVPLlERHzefZO2do4PeKtoWAQBZlqHmMdhFqU/lct6cTODwc= X-Google-Smtp-Source: AGHT+IE2O+20igLy788DPlFnfis/quqV9xho1HbHjh+b087I0VNAPtmjumgw1Plfux8gDG8AXffB/A== X-Received: by 2002:a05:6122:4907:b0:4b7:177a:25e4 with SMTP id ev7-20020a056122490700b004b7177a25e4mr49946vkb.9.1705537491290; Wed, 17 Jan 2024 16:24:51 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-147.b2b2c.ca. [72.10.141.147]) by smtp.gmail.com with ESMTPSA id m15-20020ad4448f000000b0068176e0cf05sm1446092qvt.41.2024.01.17.16.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 16:24:50 -0800 (PST) From: Maxim Cournoyer Date: Wed, 17 Jan 2024 19:24:32 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/dlang.scm (gdmd) [inputs]: Replace gdc-11 with gdc. Change-Id: Ie035bb79c128c266cee85cf11bf79216f4f8b454 --- gnu/packages/dlang.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 61823714f6..5c9766110d 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -136,8 +136,7 @@ (define-public gdmd (string-append "my $gdc_dir = \"" (dirname (search-input-file inputs "/bin/gdc")) "\";\n")))))))) - (inputs - (list gdc-11 perl)) + (inputs (list gdc perl)) (home-page "https://github.com/D-Programming-GDC/gdmd") (synopsis "DMD-like wrapper for GDC") (description "This package provides a DMD-like wrapper for the From patchwork Thu Jan 18 00:24:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 59083 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 0BA8427BBE9; Thu, 18 Jan 2024 00:26:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 BE8C927BBE2 for ; Thu, 18 Jan 2024 00:26:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQGEO-0006zu-D0; Wed, 17 Jan 2024 19:26:04 -0500 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 1rQGEL-0006y4-8V for guix-patches@gnu.org; Wed, 17 Jan 2024 19:26:01 -0500 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 1rQGEK-0003zH-UG for guix-patches@gnu.org; Wed, 17 Jan 2024 19:26:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQGEM-0007N8-5d; Wed, 17 Jan 2024 19:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68554] [PATCH 3/3] gnu: Add dmd. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 00:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68554 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68554@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 68554-submit@debbugs.gnu.org id=B68554.170553750728229 (code B ref 68554); Thu, 18 Jan 2024 00:26:02 +0000 Received: (at 68554) by debbugs.gnu.org; 18 Jan 2024 00:25:07 +0000 Received: from localhost ([127.0.0.1]:53988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQGDS-0007LE-JX for submit@debbugs.gnu.org; Wed, 17 Jan 2024 19:25:07 -0500 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]:50638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQGDQ-0007KQ-GM for 68554@debbugs.gnu.org; Wed, 17 Jan 2024 19:25:05 -0500 Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-681397137afso44930256d6.1 for <68554@debbugs.gnu.org>; Wed, 17 Jan 2024 16:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705537497; x=1706142297; 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=buIPMU60yjitaD8i0jStFhfIksDv8p5/A+KPSjm72E0=; b=nRMBhLXHb3c2fEoa99jQs6TCLPMj1nvctGD1KHtoD7ypcvtLYT75IICo3Hs+SSw+BL IBhDgNhEPpIvN33NlM1LY4AeMNUeLwVQhPeHioqvLSUfzPlDu+ADh1xisXgtzCmd7fOE rfeJDvd5MMFsQH252JK40N/AHrKIByMKQMtCDZXg1RAeWolAgoEAepF4NfGHbqS0E2h7 y3lpP9UXy7rw25FiF/1wUHgEmJXNgr+AbAsyzJFrqD5ugPamqYxw+kbR7asp1P3sm5ZI YvkHI6H/L7bpOWm5tnE57tXUKOf0cZMiHqFaVG1HmDpCE2luCCwIm0YDYiaRDj1Z4sop UvPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705537497; x=1706142297; 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=buIPMU60yjitaD8i0jStFhfIksDv8p5/A+KPSjm72E0=; b=XFqr19+/0m9ugNo3b7vseheJ1En0/KKTzYoM2f5qeL5+1hnyd77r79TqNrqt9Yr7y4 oMtOqNw6IDI5B4dOIVbwWzKmNQC7NlyEb6YuqQmv1qdd/3CO6VGnU01b5Gt9DDq4+l4V XtEgCP0k6diVqZNPUHrtG3auN4X5g4MZH1IGOZSdzwjTZh5A8WDQ9cTHawy8iC3v5O7v iVtmAYpivuSCPpyHWhbxS4R0yhrHQXexxI5B+l8NPwy+/E7eHkr4aFOmTdgO8ws+1eLO ZN7NICknjMeCUTxqabY7tRJhiDaX6iX995omftEGLSrrbrZ61GVi/AU2RXhrIRQQoYZa 2ftg== X-Gm-Message-State: AOJu0YzBUD/IBI01KAxL7ax1nVbUdhszpoZ51Id+okVpN6aKnwTgsPy/ YpHYOdZvPtFneKapH6yeOa08R1onkD5nhA== X-Google-Smtp-Source: AGHT+IEbptsrRoXFqe6KqgEf2G/P5rzuG5z0uQezWwQHFLKs1wnId/a0+mFY/K1ezuNGAnlNFH2bnw== X-Received: by 2002:a05:6214:202f:b0:681:5ab7:5c6d with SMTP id 15-20020a056214202f00b006815ab75c6dmr8095963qvf.104.1705537497081; Wed, 17 Jan 2024 16:24:57 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-147.b2b2c.ca. [72.10.141.147]) by smtp.gmail.com with ESMTPSA id m15-20020ad4448f000000b0068176e0cf05sm1446092qvt.41.2024.01.17.16.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 16:24:56 -0800 (PST) From: Maxim Cournoyer Date: Wed, 17 Jan 2024 19:24:33 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/dlang.scm (dmd-bootstrap, dmd): New variables. Change-Id: I53e00a429e2084a392341ef1bc7ea63f0fcaaab4 --- gnu/packages/dlang.scm | 164 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 5c9766110d..dd7951e01d 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -358,6 +358,170 @@ (define-public ldc `(("clang" ,clang-14) ;propagates llvm and clang-runtime ("python-lit" ,python-lit)))))) +;;; Bootstrap version of phobos that is built with GDC, using GDC's standard +;;; library. +(define dmd-bootstrap + (package + ;; This package is purposefully named just "dmd" and not "dmd-bootstrap", + ;; as the final dmd package rewrites references from this one to itself, + ;; and their names must have the same length to avoid corrupting the + ;; binary. + (name "dmd") + (version "2.106.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlang/dmd") + (commit (string-append "v" version)))) + (file-name (git-file-name "dmd" version)) + (sha256 + (base32 + "1bq4jws1vns2jjzfz7biyngrx9y5pvvgklymhrvb5kvbzky1ldmy")))) + (build-system gnu-build-system) + (arguments + (list + #:disallowed-references (list (gexp-input (canonical-package gcc) + "lib")) + ;; Disable tests, as gdmd cannot cope with some arguments used such as + ;; '-conf'. + #:tests? #f + #:test-target "test" + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + ;; XXX: Proceed despite conflicts from symbols provided by both + ;; the source built and GDC. + "DFLAGS=-L--allow-multiple-definition" + "ENABLE_RELEASE=1" + (string-append "HOST_CXX=" #$(cxx-for-target)) + "HOST_DMD=gdmd" + (string-append "INSTALL_DIR=" #$output) + ;; Do not build the shared libphobos2.so library, to avoid + ;; retaining a reference to gcc:lib. + "SHARED=0" + (string-append "SYSCONFDIR=" #$output "/etc") + "VERBOSE=1" + "-f" "posix.mak") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-phobos-source-and-chdir + ;; Start with building phobos, which in turns will automatically + ;; build druntime and dmd. A minimal dmd command is still + ;; required to do so, which is why we need dmd-bootstrap-0. + (lambda _ + (symlink "." "dmd") ;to please the build system expected layout + (copy-recursively + #$(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlang/phobos") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yw7nb5d78cx9m7sfibv7rfc7wj3w0dw9mfk3d269qpfpnwzs4n9"))) + "phobos") + (chdir "phobos"))) + (add-after 'copy-phobos-source-and-chdir 'adjust-phobos-install-dirs + (lambda _ + (substitute* "posix.mak" + ;; Install to lib directory, not to e.g. 'linux/lib64'. + (("\\$\\(INSTALL_DIR)/\\$\\(OS)/\\$\\(lib_dir)") + (string-append #$output "/lib")) + ;; Do not install license file, already done by the gnu build + ;; system. + ((".*\\$\\(INSTALL_DIR)/phobos-LICENSE.txt.*") "")))) + (delete 'configure) + (add-after 'install 'install-druntime + (lambda args + (chdir "../druntime") + (apply (assoc-ref %standard-phases 'install) args) + (chdir ".."))) + (add-after 'install-druntime 'install-includes + (lambda _ + ;; Normalize the include files prefix to include/dmd. + (let ((include-dir (string-append #$output "/include/dmd"))) + (mkdir-p include-dir) + (rename-file (string-append #$output "/src/phobos") + (string-append include-dir)) + (copy-recursively "druntime/import" include-dir)) + (delete-file-recursively (string-append #$output "/src")))) + (add-after 'install-druntime 'install-dmd + (assoc-ref %standard-phases 'install)) + (add-after 'install-license-files 'refine-install-layout + (lambda _ + (let* ((docdir (string-append #$output "/share/doc/" + (strip-store-file-name #$output))) + ;; The dmd binary gets installed to + ;; e.g. /linux/bin64/dmd. + (dmd (car (find-files #$output "^dmd$"))) + (dmd.conf (car (find-files #$output "^dmd.conf$"))) + (os-dir (dirname (dirname dmd)))) + ;; Move samples from root to the doc directory. + (rename-file (string-append #$output "/samples") + (string-append docdir "/samples")) + ;; Remove duplicate license file. + (delete-file (string-append #$output + "/dmd-boostlicense.txt")) + ;; Move dmd binary and dmd.conf. + (install-file dmd (string-append #$output "/bin")) + (install-file dmd.conf (string-append #$output "/etc")) + (delete-file-recursively os-dir)))) + (add-after 'refine-install-layout 'patch-dmd.conf + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (search-input-file outputs "etc/dmd.conf") + (("lib(32|64)") + "lib") + (("\\.\\./src/(phobos|druntime/import)") + "include/dmd"))))))) + (native-inputs (list gdmd which)) + (home-page "https://github.com/dlang/dmd") + (synopsis "Reference D Programming Language compiler") + (description "@acronym{DMD, Digital Mars D compiler} is the reference +compiler for the D programming language.") + (license license:boost1.0))) + +;;; Second bootstrap of DMD, built using dmd-bootstrap, with its shared +;;; libraries preserved. +(define-public dmd + (package + (inherit dmd-bootstrap) + (arguments + (substitute-keyword-arguments + (strip-keyword-arguments + '(#:tests?) ;reinstate tests + (package-arguments dmd-bootstrap)) + ((#:disallowed-references _ ''()) + (list dmd-bootstrap)) + ((#:make-flags _ ''()) + #~(list (string-append "CC=" #$(cc-for-target)) + "ENABLE_RELEASE=1" + (string-append "HOST_CXX=" #$(cxx-for-target)) + (string-append "INSTALL_DIR=" #$output) + "VERBOSE=1" + "-f" "posix.mak")) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'patch-dmd.conf 'rewrite-references-to-bootstrap + ;; DMD keeps references to include files used to build a + ;; binary. Rewrite those of dmd-bootstrap to itself, to reduce + ;; its closure size. + (lambda* (#:key native-inputs inputs outputs + #:allow-other-keys) + (let ((dmd (search-input-file outputs "bin/dmd")) + (dmd-bootstrap (dirname + (dirname + (search-input-file + (or native-inputs inputs) + "bin/dmd"))))) + ;; XXX: Use sed, as replace-store-references wouldn't + ;; replace the references, while substitute* throws an + ;; error. + (invoke "sed" "-i" + (format #f "s,~a,~a,g" dmd-bootstrap #$output) + dmd)))))))) + (native-inputs (modify-inputs (package-native-inputs dmd-bootstrap) + (replace "gdmd" dmd-bootstrap))))) + (define-public dub (package (name "dub")