From patchwork Mon Oct 23 12:43:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55166 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 5E0CF27BBE2; Mon, 23 Oct 2023 13:47:34 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 9AD0F27BBE9 for ; Mon, 23 Oct 2023 13:47:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuL3-0002uQ-SN; Mon, 23 Oct 2023 08:47:21 -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 1quuKM-0001jD-Tn for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:47 -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 1quuKK-0003Vk-V6 for guix-patches@gnu.org; Mon, 23 Oct 2023 08:46:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuKm-0007kV-P7; Mon, 23 Oct 2023 08:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 11/14] gnu: Add clang-17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806521629707 (code B ref 66701); Mon, 23 Oct 2023 12:47:04 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:46:56 +0000 Received: from localhost ([127.0.0.1]:49392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKe-0007j5-7J for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:55202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuKc-0007iu-LM for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:46:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698065032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/5gFi7e2WC8dhlkoVFo/KHXSxM0lmTN/5Qh4oyPrrE=; b=c/OM78mgQP7Qc3kWu+532Qxb0PlDAbolpSqC1ClF+aeFcHOscZndSdk4PcJKKwOw9BdgfD 1iVDn5QV482I0DrliFsS+vTIKxbyO+ZLCvOfdFM6Tp8ic3Rfk1zQpLndD5loov/8KGjlw2 cbUNBBP+6kUZKhdB/FhtjIIWPMlZ6RYqtKb2rcGVut9pCVhBojK7jtFDYntVgT12UxLJrA m/KTA+L0awqW9mzDh1zp+wwGaVpu16HbEHWrmGFxqMCMrZi8BgZzpFhj5wMS+4JJca5NyD jWR8eExLhHUsC5jFRe3u+VDLUAia2wzRCn9+wfHCUEjW5aQgSrGk1tEITlKM9Q== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:43:55 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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)[arguments]: Include test runner in CMakeLists.txt when version >= 17. (clang-17): New variable. Change-Id: Ia3cd8013d497b72522e95f6face5975bf79f93b3 --- gnu/packages/llvm.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 06ecbf7e1b..8dc87ad01b 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -358,6 +358,15 @@ (define* (clang-from-llvm llvm clang-runtime (("@GLIBC_LIBDIR@") (string-append libc "/lib")))))) #t))) + ,@(if (version>=? version "17") + '((add-after 'unpack 'include-test-runner + (lambda _ + (substitute* "CMakeLists.txt" + ((".*llvm_gtest" line) + (string-append + "add_subdirectory(${LLVM_THIRD_PARTY_DIR}/uni\ +ttest third-party/unittest)\n" line)))))) + '()) ;; Awkwardly, multiple phases added after the same phase, ;; e.g. unpack, get applied in the reverse order. In other ;; words, adding 'change-directory last means it occurs @@ -1497,6 +1506,18 @@ (define-public llvm-17 (define-public clang-runtime-17 (clang-runtime-from-llvm llvm-17)) +(define-public clang-17 + (clang-from-llvm + llvm-17 clang-runtime-17 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-17))) + (sha256 + (base32 + "0an16xdc8rgrdf0dcq3sdg82ajyb00h4bff9n0gm7gqf48ds0da8"))))) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13)