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")