From patchwork Sun Nov 13 05:02:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 44486 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 20E9927BBE9; Sun, 13 Nov 2022 05:03:30 +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_H2,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 629DD27BBEB for ; Sun, 13 Nov 2022 05:03:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ou599-0003F2-U2; Sun, 13 Nov 2022 00:03:07 -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 1ou596-0003Dl-M9 for guix-patches@gnu.org; Sun, 13 Nov 2022 00:03:04 -0500 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 1ou596-0004pP-5X for guix-patches@gnu.org; Sun, 13 Nov 2022 00:03:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ou595-0003KU-Vr for guix-patches@gnu.org; Sun, 13 Nov 2022 00:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH 3/3] gnu: Add clang-15. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Nov 2022 05:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59237 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59237@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.166831574412720 (code B ref 59237); Sun, 13 Nov 2022 05:03:03 +0000 Received: (at 59237) by debbugs.gnu.org; 13 Nov 2022 05:02:24 +0000 Received: from localhost ([127.0.0.1]:49808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou58R-0003J5-RY for submit@debbugs.gnu.org; Sun, 13 Nov 2022 00:02:24 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:38496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou58N-0003IR-A6 for 59237@debbugs.gnu.org; Sun, 13 Nov 2022 00:02:19 -0500 Received: by mail-qv1-f47.google.com with SMTP id o8so6033590qvw.5 for <59237@debbugs.gnu.org>; Sat, 12 Nov 2022 21:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=LCMvRriAcwVLzDQW4q1WTHk/0RvPn8+I/w7apWsmcEE=; b=q1Zsu7PxmaHWkCG0H2jZVdyjPbgJ8Pt7qJFBbsV8N7fQWAy4f0MAk3fUjh01T1HI0m bXCT6s/041QT1ckx2Xv2TGbsb2Ji6BeFUCvUlhlgknrYtoRbccJvsFZAuih2XkYzp1Ud aQP4T3Mh3Y5sx7OJ2jpUJuEDoM2OCUwWDlDoGmvi7Z8IhAkK6vnwbKYIERwYE3T00GUX DcwFmSq7JDyOlqYKt8YbRB1ZsyY0dvxPUxIS2Q6wuQXSXX7jGT4wVyln58F3a+iq8/ch hi+mqHrJI8X4Uhd7CzJgQJFDw9WG7oEeQkJu8dAGJYZBgOBig30Hf7yGch9hN0427KBt GB4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=LCMvRriAcwVLzDQW4q1WTHk/0RvPn8+I/w7apWsmcEE=; b=xOe8L1elwC3dk83/SEJsy9fM7hfWLzOKZ+Tg8+HHhTYNSAyXVymiuTnOjiJ87/G6KE qylbQT/r0Q5xUddeXgGMoO5UzeHvQ/ShBkPUQPscSSg2IPmzdTM9Za9rTdQ4CVaiCThN Fhau6+XXfxkTxKnuGxSjzRLTuSuHrYnratCAQ8SxftI1NjJ52uKgn42BzcOuGbE+T7yq Lk54sm3XDThR94hgqPaFfZb5I6wnYA3Wce5xykW2bpHn796wplQ5u02xCcNGBgWv9gzF NT/tXu/ZQXyYmskPAsN/x6bd2vlHIbLiQW+RiHOWU4dgqv/HsnTbU45UOrUY6T96ADWa D54w== X-Gm-Message-State: ANoB5pl1rOV2aS1Y2bznLaTjKlS4jHE7+z/0sjG1mTntYJpzfJOVW56B lYqr3wEa2IsY/RvGPuDBKSzPJQmP1qI= X-Google-Smtp-Source: AA0mqf4kerqZXVAOgZ//p1e2md67kGmjlixOq8x2ek5I62Y4sQoPOu8i7xwP3uxCEkJFvBVcklK+eQ== X-Received: by 2002:a05:6214:2b97:b0:4b1:95bf:57f2 with SMTP id kr23-20020a0562142b9700b004b195bf57f2mr7927260qvb.113.1668315733658; Sat, 12 Nov 2022 21:02:13 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id j6-20020a05620a410600b006ee949b8051sm4282671qko.51.2022.11.12.21.02.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 21:02:13 -0800 (PST) From: Maxim Cournoyer Date: Sun, 13 Nov 2022 00:02:00 -0500 Message-Id: <20221113050200.27277-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221113050200.27277-1-maxim.cournoyer@gmail.com> References: <20221113050200.27277-1-maxim.cournoyer@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 * gnu/packages/llvm.scm (clang-from-llvm*): New helper. (clang-15): New variable. --- gnu/packages/llvm.scm | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d7b6207dc4..12e1e642c6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -422,6 +422,43 @@ (define* (clang-from-llvm llvm clang-runtime license:asl2.0 ;with LLVM exceptions license:ncsa)))) +;;; TODO: Integrate into original on core-updates, perhaps with an extra +;;; option such as #:build-shared-libs? documented as a legacy feature. +(define* (clang-from-llvm* llvm clang-runtime + #:optional hash + #:key (patches '()) tools-extra + (properties + (append `((release-monitoring-url + . ,%llvm-release-monitoring-url)) + (clang-properties (package-version llvm))))) + "Produce Clang with dependencies on LLVM and CLANG-RUNTIME, and applying the +given PATCHES. When TOOLS-EXTRA is given, it must point to the +'clang-tools-extra' tarball, which contains code for 'clang-tidy', 'pp-trace', +'modularize', and other tools." + (let ((base (clang-from-llvm llvm clang-runtime hash + #:patches patches #:tools-extra tools-extra + #:properties properties))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases ''%standard-phases) + #~(modify-phases #$phases + ;; Like the original, sans BUILD_SHARED_LIBS patching. + #$@(if tools-extra + #~((replace 'add-tools-extra + (lambda* (#:key inputs #:allow-other-keys) + ;; Unpack the 'clang-tools-extra' tarball under + ;; tools/. + (let ((extra (assoc-ref inputs "clang-tools-extra"))) + (invoke "tar" "xf" extra) + (rename-file #$(string-append + "clang-tools-extra-" + (string-delete #\- (package-version llvm)) + ".src") + "tools/extra"))))) + #~())))))))) + (define (clang-properties version) "Return package properties for Clang VERSION." `((compiler-cpu-architectures @@ -729,6 +766,30 @@ (define-public clang-runtime-14 ("gcc" ,gcc-11) ,@(package-native-inputs template)))))) +(define-public clang-15 + (let ((template + (clang-from-llvm* + llvm-15 clang-runtime-15 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-15))) + (sha256 + (base32 + "03adxlh84if9p53m6izjsql500rjza9rng8akab2pdqibgrg73rh")))))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:configure-flags flags ''()) + #~(cons "-DCLANG_LINK_CLANG_DYLIB=ON" #$flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "clang")))))))))) + (define-public clang-14 (let ((template (clang-from-llvm llvm-14 clang-runtime-14