From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH 0/3] Add LLVM/Clang 15.0.4. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Nov 2022 04:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59237 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59237@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166831524411839 (code B ref -1); Sun, 13 Nov 2022 04:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Nov 2022 04:54:04 +0000 Received: from localhost ([127.0.0.1]:49797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou50N-00034t-Rx for submit@debbugs.gnu.org; Sat, 12 Nov 2022 23:54:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:33242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou50M-00034b-40 for submit@debbugs.gnu.org; Sat, 12 Nov 2022 23:54:03 -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 1ou50L-0007WF-VB for guix-patches@gnu.org; Sat, 12 Nov 2022 23:54:01 -0500 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ou50K-0002aN-IM for guix-patches@gnu.org; Sat, 12 Nov 2022 23:54:01 -0500 Received: by mail-qv1-xf36.google.com with SMTP id x13so6037120qvn.6 for ; Sat, 12 Nov 2022 20:54:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NEmbVkXM5FmyYBcDEgrRn50PmCOqz9ODV/XWwk9WSdY=; b=LAmHcJ6gTj9Y6Hb76SJb7nKW7peLffig36XJA8B2QVzvz2RNply2VlnWU6AqoiQnR5 8lZni+88I9Qhspxb79/mIyS3V0SSV4tlTXmJFGB1Jo5/KymGycfiYMHxL5cfvr4MQTNf 3wuRkH4R8tT97kMmuAZ+ciw/SJtxQbOFUJ1o+eqQpaMIj9IqccD7evsSUmn5AdXBGPkF 3IWdrOTfwXvjk/VjFleaeo4VNds9nz5ZuvuzuYZd5pmaq9CQNYg3Fwes7yygNqq3/Z6C SAj+jiTnFmK1hp99Ipn4dLI3rXfDeimdl40mWS+M4JD5VCUo/aJji2LhbEKvSPUVjDUy 5ERg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NEmbVkXM5FmyYBcDEgrRn50PmCOqz9ODV/XWwk9WSdY=; b=cAeReEccyZzLoCyePgPcoq4rbFoA8OK1Gfqw5g8XYiL/1pjhmWmfkZA/2wxcik6UBM 4RM1iBSTlQ53m1qIEsxUfgWjh5DzHmUi3/kuHmQGoNnQu3aFFjlhcW+9bW/ZsKieRvzJ qcnSECFASV9SXRUjg99LdAbwI8R42cA3ayzsLabJmGCgTXnzjbKf5KhVZ0L8YGDgeS8D YCa/r/MuAXxhyBqboeq3KRtau1Kxz2qO2b79uFG0e6+deClhsCC7xalrdCRbbY8Skhit PVj9sX4cMD0ysB4GNn3/jPN+ZN+xyTG210NNM13SGRKxWF3p+hvvfhWdyHnPM8sCOkRQ m93Q== X-Gm-Message-State: ANoB5pn4OcqC22fkHP+AOmOKU2xbHivqatKyfGArprb0R9Z8zpenitLM cklpDox6Jc0SutjGm9vGlYNhMXjo0Aw= X-Google-Smtp-Source: AA0mqf4fxJhR5wnfDF918qOU7/F03AmmSrrQfsaV8ofqCPMuA75SFUlVwIltK7SIMTbsh1z182sDRQ== X-Received: by 2002:a0c:f849:0:b0:4bb:699e:4cec with SMTP id g9-20020a0cf849000000b004bb699e4cecmr8269091qvo.6.1668315239341; Sat, 12 Nov 2022 20:53:59 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id j11-20020a05620a410b00b006cbc00db595sm4360350qko.23.2022.11.12.20.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:53:58 -0800 (PST) From: Maxim Cournoyer Date: Sat, 12 Nov 2022 23:53:54 -0500 Message-Id: <20221113045354.26955-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f36; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf36.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi Guix, This adds the latest clang, build with the supported configuration for a shared library (DYLIB), and with some size reduction via stripping static archives where possible. Maxim Cournoyer (3): gnu: Add llvm-15. gnu: Add clang-runtime-15. gnu: Add clang-15. gnu/local.mk | 1 + gnu/packages/llvm.scm | 153 +++++++++++++++++- .../patches/clang-15.0-libc-search-path.patch | 95 +++++++++++ 3 files changed, 247 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/clang-15.0-libc-search-path.patch -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH 1/3] gnu: Add llvm-15. References: <20221113045354.26955-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221113045354.26955-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Nov 2022 05:03:02 +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.166831574012702 (code B ref 59237); Sun, 13 Nov 2022 05:03:02 +0000 Received: (at 59237) by debbugs.gnu.org; 13 Nov 2022 05:02:20 +0000 Received: from localhost ([127.0.0.1]:49804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou58N-0003Im-Rx for submit@debbugs.gnu.org; Sun, 13 Nov 2022 00:02:20 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:36377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou58D-0003IC-6E for 59237@debbugs.gnu.org; Sun, 13 Nov 2022 00:02:18 -0500 Received: by mail-qt1-f170.google.com with SMTP id fz10so5178074qtb.3 for <59237@debbugs.gnu.org>; Sat, 12 Nov 2022 21:02:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GVGm9Ef9/JuYyZCp7D7Bc3SEraoZ2JiZ50RMwUqFWAo=; b=okY223IV7+quZTNkpvpxtAuJdiYAspncndCBClBBDkb8DkwhQxPfp/eV4eYhR3G+bs EfrJxDqpGIC1Gp/rYOCpS8V22S6XMV351ZEYPkPU4o9IwhFCAxbwwm3IIYiBXUEuY5np MuXOSksMPItCwyEHFuqBnJSxWGUTPd4tMIF5YBr/jzJ4x33X3zWbm83BgRhmPFE0a28U Hg55B2w9VRF80tukd9T+/sgNICkGo0fsvPVt9L1D/onUC7kv7q0vYTF2AxLNiuL+EKG6 bXTi5vD5MGPb1vhz10srBBWXAO0I0Zbcp/8L4WKc1upwNUUBt7AgoEQ2V22qNHdaJi3g AjJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GVGm9Ef9/JuYyZCp7D7Bc3SEraoZ2JiZ50RMwUqFWAo=; b=xOZsp6n6az4CmKCGAXqxVkpvdUyRNwSzejXYJj7gbGGbqR/s7xeJF6wgATwlOn4NdW y+iuDcBJ5ScUcULtGZStrVxGbO8LComQhPCcgPAEuJAK6RvNq+cFMwD5eyt+1cX1RKIc qYq/DRzgD9z1SA8IZ5SmJhUXHn5N4K14xITHyZ4SYjzlDtYTTqDP46hqIteTTaxUsq58 2GzsWNh0LEJ449ubxUWwCaKO4uGfwCX9ATfxVX9agg7fyRlQ67Zwr1mYou9ybmOz5wEI c0zVjZA+sksOgLMo1QpM2ecYE9DfUR31vE4W1flZu7PbBoJwfgpzmPN4gtfJRRhGHT4u lUCw== X-Gm-Message-State: ANoB5pnv+m1OD4Xrwn70atA4/IoaFizhcA1WcecTw+yFAxusiV8UUxhT vfEphXacHUnqGiGO2m9uh/EZjVWI6Y8= X-Google-Smtp-Source: AA0mqf4ExovBDRhY4D0ZvslrcvGi2MF15xPJ7ot4fvOQl3ktGkzbExKu1UEnjrUhAYYTaOO4ujVrUw== X-Received: by 2002:ac8:4e4f:0:b0:3a5:4f7e:bab2 with SMTP id e15-20020ac84e4f000000b003a54f7ebab2mr7497334qtw.527.1668315723164; Sat, 12 Nov 2022 21:02:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 21:02:02 -0800 (PST) From: Maxim Cournoyer Date: Sun, 13 Nov 2022 00:01:58 -0500 Message-Id: <20221113050200.27277-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (llvm-15): New variable. * gnu/packages/patches/clang-15.0-libc-search-path.patch: New file. * gnu/local.mk: Register it. --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 69 +++++++++++++- .../patches/clang-15.0-libc-search-path.patch | 95 +++++++++++++++++++ 3 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/clang-15.0-libc-search-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index e3e02314bb..6b6ada17a5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -976,6 +976,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-12.0-libc-search-path.patch \ %D%/packages/patches/clang-13.0-libc-search-path.patch \ %D%/packages/patches/clang-14.0-libc-search-path.patch \ + %D%/packages/patches/clang-15.0-libc-search-path.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 324149116b..0a35aed7c6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -545,10 +545,12 @@ (define (make-clang-toolchain clang libomp) ("libc-static" ,glibc "static"))))) (define %llvm-monorepo-hashes - '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx"))) + '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") + ("15.0.4" . "0j5kx4s970qzcjr83kk6776zzjqfshl61x9fagqz8kjxcjbpg8cj"))) (define %llvm-patches - '(("14.0.6" . ("clang-14.0-libc-search-path.patch")))) + '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) + ("15.0.4" . ("clang-15.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -560,6 +562,69 @@ (define (llvm-monorepo version) (sha256 (base32 (assoc-ref %llvm-monorepo-hashes version))) (patches (map search-patch (assoc-ref %llvm-patches version))))) +;;; TODO: Make the base llvm all other LLVM inherit from on core-updates. +(define-public llvm-15 + (package + (name "llvm") + (version "15.0.4") + (source (llvm-monorepo version)) + (build-system cmake-build-system) + (outputs '("out" "opt-viewer")) + (arguments + (list + #:configure-flags + #~(list + ;; These options are required for cross-compiling LLVM according + ;; to . + #$@(if (%current-target-system) + #~((string-append "-DLLVM_TABLEGEN=" + #+(file-append this-package + "/bin/llvm-tblgen")) + #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" + (%current-target-system)) + #$(string-append "-DLLVM_TARGET_ARCH=" + (system->llvm-target)) + #$(string-append "-DLLVM_TARGETS_TO_BUILD=" + (system->llvm-target))) + '()) + ;; Note: sadly, the build system refuses the use of + ;; -DBUILD_SHARED_LIBS=ON and the large static archives are needed to + ;; build clang-runtime, so we cannot delete them. + "-DLLVM_BUILD_LLVM_DYLIB=ON" + "-DLLVM_LINK_LLVM_DYLIB=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" ;for some third-party utilities + "-DLLVM_INSTALL_UTILS=ON" ;needed for rustc + "-DLLVM_PARALLEL_LINK_JOBS=1") ;cater to smaller build machines + ;; Don't use '-g' during the build, to save space. + #:build-type "Release" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "llvm"))) + (add-after 'install 'install-opt-viewer + (lambda* (#:key outputs #:allow-other-keys) + (let* ((opt-viewer-share (string-append #$output:opt-viewer + "/share"))) + (mkdir-p opt-viewer-share) + (rename-file (string-append #$output "/share/opt-viewer") + opt-viewer-share))))))) + (native-inputs (list python-wrapper perl)) + (inputs (list libffi)) + (propagated-inputs (list zlib)) ;to use output from llvm-config + (home-page "https://www.llvm.org") + (synopsis "Optimizing compiler infrastructure") + (description + "LLVM is a compiler infrastructure designed for compile-time, link-time, +runtime, and idle-time optimization of programs from arbitrary programming +languages. It currently supports compilation of C and C++ programs, using +front-ends derived from GCC 4.0.1. A new front-end for the C family of +languages is in development. The compiler infrastructure includes mirror sets +of programming tools as well as libraries with equivalent functionality.") + (license license:asl2.0) + (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))))) + (define-public llvm-14 (package (name "llvm") diff --git a/gnu/packages/patches/clang-15.0-libc-search-path.patch b/gnu/packages/patches/clang-15.0-libc-search-path.patch new file mode 100644 index 0000000000..20726859b2 --- /dev/null +++ b/gnu/packages/patches/clang-15.0-libc-search-path.patch @@ -0,0 +1,95 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on foreign distros. + +diff --git a/clang/lib/Driver/Distro.cpp b/clang/libDriver/Distro.cpp +index 1898667..35de813 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/libDriver/Distro.cpp +@@ -97,6 +97,10 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { + } + + static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) { ++ // The compiler should always behave the same, even when used via Guix on a ++ // foreign distro. ++ return Distro::UnknownDistro; ++ + Distro::DistroType Version = Distro::UnknownDistro; + + // Newer freedesktop.org's compilant systemd-based systems +diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/libDriver/ToolChains/Cuda.cpp +index 7ad990d..e4da4d4 100644 +--- a/clang/lib/Driver/ToolChains/Cuda.cpp ++++ b/clang/libDriver/ToolChains/Cuda.cpp +@@ -117,6 +117,9 @@ CudaInstallationDetector::CudaInstallationDetector( + const Driver &D, const llvm::Triple &HostTriple, + const llvm::opt::ArgList &Args) + : D(D) { ++ // Don't look for CUDA in /usr. ++ return; ++ + struct Candidate { + std::string Path; + bool StrictChecking; +diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/libDriver/ToolChains/Linux.cpp +index ceb1a98..9d7a14a 100644 +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/libDriver/ToolChains/Linux.cpp +@@ -188,6 +188,10 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + Generic_GCC::PushPPaths(PPaths); + ++ // Comment out the distro-specific tweaks so that they don't bite when ++ // using Guix on a foreign distro. ++#if 0 ++ + Distro Distro(D.getVFS(), Triple); + + if (Distro.IsAlpineLinux() || Triple.isAndroid()) { +@@ -256,6 +260,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + if (IsAndroid || Distro.IsOpenSUSE()) + ExtraOpts.push_back("--enable-new-dtags"); ++#endif + + // The selection of paths to try here is designed to match the patterns which + // the GCC driver itself uses, as this is part of the GCC-compatible driver. +@@ -276,6 +281,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + } + Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths); + ++#if 0 + addPathIfExists(D, concat(SysRoot, "/lib", MultiarchTriple), Paths); + addPathIfExists(D, concat(SysRoot, "/lib/..", OSLibDir), Paths); + +@@ -304,9 +310,11 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, concat(SysRoot, "/", OSLibDir, ABIName), Paths); + addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir, ABIName), Paths); + } ++#endif + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + ++#if 0 + // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs + // libc++.so in D.Dir+"/../lib/". Detect this path. + // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported. +@@ -316,6 +324,14 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + addPathIfExists(D, concat(SysRoot, "/lib"), Paths); + addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); ++#endif ++ ++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, ++ // and friends can be found. ++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); ++ ++ // Add GCC's lib/ directory so libstdc++.so can be found. ++ addPathIfExists(D, GCCInstallation.getParentLibPath(), Paths); + } + + ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const { -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH 2/3] gnu: Add clang-runtime-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.166831574012708 (code B ref 59237); Sun, 13 Nov 2022 05:03:03 +0000 Received: (at 59237) by debbugs.gnu.org; 13 Nov 2022 05:02:20 +0000 Received: from localhost ([127.0.0.1]:49806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou58O-0003Ip-Gx for submit@debbugs.gnu.org; Sun, 13 Nov 2022 00:02:20 -0500 Received: from mail-qk1-f171.google.com ([209.85.222.171]:39819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou58L-0003IP-Mi for 59237@debbugs.gnu.org; Sun, 13 Nov 2022 00:02:18 -0500 Received: by mail-qk1-f171.google.com with SMTP id g10so5660366qkl.6 for <59237@debbugs.gnu.org>; Sat, 12 Nov 2022 21:02:17 -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=RLDM7Oa/YxgF7Pikd4Cfv+lyMzKTnfs0+ypa9mX/MNE=; b=qmQnBOjmiiBSYnxdLiRIa4L69LcqcUssOJwtlgjLTI5gtffK84PPX6CAlk5H8z0Ouw 2RiiIPT5cLRoT3FmwJblBXjSv3Fdkrtd7MoGd/pAb/c8JqOzNvp+Er9lu7C6xt4ftk8r oKRYjsYOy52nFmvv2tFTmRCSr2zPv50Icv5tFuBAm0n6Ena0OL6KZ+NBJXFy5pSyCANW r2owcBigCg7KXJtr06kVVl9wLLgnYV64bLgXp6LIsTBBD45jWgVrmNgvlz8Hi6rtHOHL Up5LtN1EM7uUbb9pOnY4iuUm1jNvw0FxtD1MXOk9dbzXD/xsDxM0GJvQ0D9FucMPkOyC cy1Q== 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=RLDM7Oa/YxgF7Pikd4Cfv+lyMzKTnfs0+ypa9mX/MNE=; b=KDgi54N4rQ+WLv2xTo5ClWJAPuBMLZCkSvBdDJA8rBrt1p7pA1+zGTT56FZPmPw68z frG7G7iPPfgcc9xe6SRfAz6ZL7xZsPrhHM5bNvB4+h9+MSxzG07IuuE8gGKdpPIuOOUK 26Gsb3Q7uHIP/49v+ttSq5LFvhfsXc8wvIjOak3yvH/ZKZ80//kV/5zSmfX/tXXLzKNN 3XUxM1VwUErMah2R9wLI6KiHHKeSOR7OmY/0gr4HQEjweP70C0HY1ug+SKJ1+szuxECv yR5BRvTXoSL1UEJjyS3NiI6xKE+4/GV+eW8uMN5hnuBf/F15HPDoLGXGiP6+k6D+FbyH jdOw== X-Gm-Message-State: ANoB5pnwEpl2k6RCED4vd4NeWQ2a1aaaBAZtrwDJt8MvKwKUahbmzyyg LQTflM8JnOWrIPhURunj8SI20JREG1s= X-Google-Smtp-Source: AA0mqf6YyOkvyHgyTzfOU04BTMnDBiw6ISvcRNQxwvE5luoQyyIxJbJehJ1/f/ovETryJAV6vt2NjQ== X-Received: by 2002:a05:620a:4806:b0:6fa:da64:4879 with SMTP id eb6-20020a05620a480600b006fada644879mr6769946qkb.312.1668315732106; Sat, 12 Nov 2022 21:02:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 21:02:11 -0800 (PST) From: Maxim Cournoyer Date: Sun, 13 Nov 2022 00:01:59 -0500 Message-Id: <20221113050200.27277-2-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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (clang-runtime-15): New variable. --- gnu/packages/llvm.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0a35aed7c6..d7b6207dc4 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -690,6 +690,29 @@ (define-public llvm-14 (license license:asl2.0) (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))))) +(define-public clang-runtime-15 + (let ((template (clang-runtime-from-llvm llvm-15))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) + #~(modify-phases #$phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "compiler-rt"))) + (add-after 'install 'delete-static-libraries + ;; Reduce size from 33 MiB to 7.4 MiB. + (lambda _ + (for-each delete-file + (find-files #$output "\\.a(\\.syms)?$")))))))) + (native-inputs + (modify-inputs (package-native-inputs template) + (prepend gcc-12))) ;libfuzzer fails to build with GCC 11 + (inputs + (modify-inputs (package-inputs template) + (append libffi)))))) + (define-public clang-runtime-14 (let ((template (clang-runtime-from-llvm llvm-14))) (package -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH 0/3] Add LLVM/Clang 15.0.4. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Nov 2022 10:29:02 +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: Maxim Cournoyer Cc: 59237@debbugs.gnu.org, Greg Hogan Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.166850811712592 (code B ref 59237); Tue, 15 Nov 2022 10:29:02 +0000 Received: (at 59237) by debbugs.gnu.org; 15 Nov 2022 10:28:37 +0000 Received: from localhost ([127.0.0.1]:53047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1outBE-0003H2-VR for submit@debbugs.gnu.org; Tue, 15 Nov 2022 05:28:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1outBC-0003Gq-Mn for 59237@debbugs.gnu.org; Tue, 15 Nov 2022 05:28:35 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1outB7-0000zi-Fn; Tue, 15 Nov 2022 05:28:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=mTPYTk24GGa2nZ44jAx+44vmLMoL9ofoVb6aJsE/5hE=; b=p2HZrE5tlVu/rm9wkk/K +AUhEWv0k+NWAFvj+DdIsoT+H4BGBSxSeRGVms6oqAujXDM3Wdad+izlEueteJiUCyrkTDi/HKY7o Tk4QW1edqggNiUQ6trDfmRbfSbeD2MygKDtpoiskdm24k+G5911UV2diq6UH/32/Dd8MT8K40JwYc GFsx5eKe77DIEHBMmT7QFn/f4i50JQJ3nxp/kZ+O5410wmYZl2MtRI6VRMsNoEeIn4HZdYu5U1bU9 rMpCH0Qx/fYLqzNgu8eXsZhPeVhYGA8kGpIGsOXJcgNBGWhGub8cRqsQSBow2eiz8NZt2temnCP4u egmlJTS4OfSgDw==; Received: from [193.50.110.147] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1outB7-0004p1-2Z; Tue, 15 Nov 2022 05:28:29 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20221113045354.26955-1-maxim.cournoyer@gmail.com> <20221113050200.27277-1-maxim.cournoyer@gmail.com> Date: Tue, 15 Nov 2022 11:28:26 +0100 In-Reply-To: <20221113050200.27277-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 13 Nov 2022 00:01:58 -0500") Message-ID: <877czwo6k5.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! (Cc: Greg, who often takes care of those updates.) Maxim Cournoyer skribis: > +;;; TODO: Make the base llvm all other LLVM inherit from on core-updates. > +(define-public llvm-15 > + (package > + (name "llvm") > + (version "15.0.4") Can we have =E2=80=98llvm-14=E2=80=99 inherit from this one, just so we don= =E2=80=99t duplicate =E2=80=98synopsis=E2=80=99, etc.? (It overrides =E2=80=98arguments=E2=80= =99, =E2=80=98inputs=E2=80=99, and all that anyway so that should be transparent.) Otherwise LGTM. Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH 0/3] Add LLVM/Clang 15.0.4. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Nov 2022 10:34:01 +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: Maxim Cournoyer Cc: 59237@debbugs.gnu.org Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.166850841613338 (code B ref 59237); Tue, 15 Nov 2022 10:34:01 +0000 Received: (at 59237) by debbugs.gnu.org; 15 Nov 2022 10:33:36 +0000 Received: from localhost ([127.0.0.1]:53103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1outG4-0003T4-Fe for submit@debbugs.gnu.org; Tue, 15 Nov 2022 05:33:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1outG3-0003Ss-Bm for 59237@debbugs.gnu.org; Tue, 15 Nov 2022 05:33:35 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1outFx-0002Bo-VV; Tue, 15 Nov 2022 05:33:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=mT9nI2WxqhClQ/UfFTk5RVBdxBjPBJf1tQlvqlHY0jY=; b=DN8DuAPXY9iCHq18fahE bMIb6dY4VfLfAXWrNEqv06YmISGCQr7yi0g/jmsXHJiGP8nLXvUzoBHoGFG9kYL9ib+GzMZ+jI4jN zWvC11W8YyRYQ6dYEy++3DU9i8Lg4aB8A5Lmi5osO6UgSAvO4ChrmVp6L/nNygeCxLSUqkbz+10Q8 QXjXFocLmX29FnVSHBzKX5Gu2DRNj9jb9QC8tgFXmHVNBMraPfJmmZp3xOA0FJRpu3k7iXlJfMguB hJLSiKCy020SkOpTRMnPyBVm93zTTxqZiQzg6ileFyGfOU3fG2vXW5/zL3takhIgW5oR6FaNfzxOI v6NKYmvQsWXFqA==; Received: from [193.50.110.147] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1outFs-0000vL-0G; Tue, 15 Nov 2022 05:33:29 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20221113050200.27277-1-maxim.cournoyer@gmail.com> <20221113050200.27277-3-maxim.cournoyer@gmail.com> Date: Tue, 15 Nov 2022 11:33:22 +0100 In-Reply-To: <20221113050200.27277-3-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 13 Nov 2022 00:02:00 -0500") Message-ID: <8735ako6bx.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > * gnu/packages/llvm.scm (clang-from-llvm*): New helper. > (clang-15): New variable. [...] > +;;; 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 l= lvm))))) [...] > + #~(modify-phases #$phases > + ;; Like the original, sans BUILD_SHARED_LIBS patching. > + #$@(if tools-extra How about making it an option of =E2=80=98clang-from-llvm=E2=80=99 then, li= ke suggested above? In =E2=80=98clang-from-llvm=E2=80=99, we=E2=80=99d have: `((add-after 'unpack 'add-tools-extra (lambda* =E2=80=A6 ,@(if tools-need-build-shared-libs-patch? `((substitute* =E2=80=A6)) '() #t)))) That=E2=80=99d factorize things while avoiding a full rebuild. Ludo=E2=80=99. From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH 0/3] Add LLVM/Clang 15.0.4. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Nov 2022 10:36:01 +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: Maxim Cournoyer Cc: 59237@debbugs.gnu.org, Greg Hogan Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.166850850313487 (code B ref 59237); Tue, 15 Nov 2022 10:36:01 +0000 Received: (at 59237) by debbugs.gnu.org; 15 Nov 2022 10:35:03 +0000 Received: from localhost ([127.0.0.1]:53108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1outHS-0003VS-Td for submit@debbugs.gnu.org; Tue, 15 Nov 2022 05:35:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1outHR-0003Uv-Kd for 59237@debbugs.gnu.org; Tue, 15 Nov 2022 05:35:01 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1outHM-0002TO-CZ; Tue, 15 Nov 2022 05:34:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=eD6XvC3vHyXACUnR71Yp/6jRjdxiaGeE/v4hDJHgcww=; b=YXk4RZXdS0dx8w5tm7Yo 1lu2VaafpqRGD8Pib9xgPZkvAxsi+ssLXHLPwjROIpSI//pwVpjqYwFHVi+SYLZlvRgAuehdkk2zn IOs3wnWF5iN6q+gN7cNTRFh2H68aYPeflG64h1nVGwVRF2Ee5QQdtDyN42784CHmrmqYC0Z7PZUTF hgw/ki9E22D69iJSkyVnGjFl5sIkPn9TZEpiZAHW/npdODX1OnJpOPNcCi8/7ePEr9C3V2G71KNxt xX/ox1HZyI2UeIXWu0JB4NYAkyKlD8FEsctIuCDrmepFhsg6CmRkkj9zAW/PuwOyodn5YkCI5o/xS ShPzdrO70kfhNQ==; Received: from [193.50.110.147] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1outHE-0001OL-SN; Tue, 15 Nov 2022 05:34:51 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20221113050200.27277-1-maxim.cournoyer@gmail.com> <20221113050200.27277-3-maxim.cournoyer@gmail.com> Date: Tue, 15 Nov 2022 11:34:45 +0100 In-Reply-To: <20221113050200.27277-3-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 13 Nov 2022 00:02:00 -0500") Message-ID: <87y1scmrp6.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > * gnu/packages/llvm.scm (clang-from-llvm*): New helper. > (clang-15): New variable. I believe we=E2=80=99ll also need =E2=80=98libomp-15=E2=80=99 as discussed = at . Ludo=E2=80=99. From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH v2 0/5] Add LLVM/Clang 15. References: <20221113045354.26955-1-maxim.cournoyer@gmail.com> In-Reply-To: <20221113045354.26955-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 14:19:02 +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: ludo@gnu.org, Maxim Cournoyer Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.16686083205631 (code B ref 59237); Wed, 16 Nov 2022 14:19:02 +0000 Received: (at 59237) by debbugs.gnu.org; 16 Nov 2022 14:18:40 +0000 Received: from localhost ([127.0.0.1]:56440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFP-0001Sk-Qo for submit@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:40 -0500 Received: from mail-qk1-f170.google.com ([209.85.222.170]:37791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFN-0001SW-JJ for 59237@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:37 -0500 Received: by mail-qk1-f170.google.com with SMTP id x18so11673659qki.4 for <59237@debbugs.gnu.org>; Wed, 16 Nov 2022 06:18:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KNpuZHrWFhjSAGiYyBuSXg5ENsEII3wSrEyp+VMTqSc=; b=JmPuq7pnFhmgtoFr4z8H5GqwjASyLA4P+YSrhwuZqqAzw0qrDKrcvAqhHXLZ9F7+xR s1GyCHtuf3Hsz6LErsYgdby7ATgUiBSHRAx6eRhpTJJR5We0TC4rwmlwub/sF45gatEK o2La1JcPa0pzElGfP77LTOuiChXzZGv6oHrrrqIaHElOUS7xPegoDhn+oFD9bt0zDcLY xfz2kaGeky2HF5+Dt4P3Za6xJAm7d7TWQH0O24TXcUlmgTqIEMon7F6JspWuzZlw93bQ NOAc4CptniEKgAKgTDR7+6VtI/VFzi9nu+O6+ROdRHdzyVENxIitRKPnIR5mdLoL8dSN PtJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KNpuZHrWFhjSAGiYyBuSXg5ENsEII3wSrEyp+VMTqSc=; b=Z2rOGQiol+ukt2KYZjaeZgkTMfMWnpvl65A0+ZZ3e5taM9TRfz0788qgcMxJybKf+K h4s+y8NkmMDxzhRGyCeVxc3DFm77jovrt83b2eLdeqmhs800Kalu7yIxyC/u5siUerOp nTDvMVVryfhG1WA9pBcloQBSUcobzbmcYJPPzrrFpnnDb2QGfkCwfH7qpcEgLZzGHyaf dFy6l7Jx78C/1D/HpzRV5cQQMJ0PiO9sufU6Bm0WhkUaWowygQhXY1bEz9MaqhWHBtpL TQ7l/PGXsByGmaI4MYd10c2/BSNCoA1s8c1klMJRWKpxNo7jPqK427ZcGx3tVGXO/eGd 2vww== X-Gm-Message-State: ANoB5plYgkIIBSte+NEicfP7X4gCMShCtTotklq9YInG77w2Frn2Oe+Q J1awWlVdFVw7I4tXiU8285Y+85DV4wNSbw== X-Google-Smtp-Source: AA0mqf52OLok8si2h+wXsf0JdlwQTPAh7Rx9g6pqSQgzhQysdW6F6qUm7IPI0DmTNX8BEHJHih+fAw== X-Received: by 2002:ae9:e012:0:b0:6fa:ac63:f836 with SMTP id m18-20020ae9e012000000b006faac63f836mr19207148qkk.43.1668608311671; Wed, 16 Nov 2022 06:18:31 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-21.b2b2c.ca. [72.10.133.21]) by smtp.gmail.com with ESMTPSA id n16-20020a05620a295000b006b640efe6dasm10006660qkp.132.2022.11.16.06.18.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:18:31 -0800 (PST) From: Maxim Cournoyer Date: Wed, 16 Nov 2022 09:18:25 -0500 Message-Id: <20221116141830.12398-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This v2 series includes the following changes the following changes, based on Ludovic's review: * Reduce code duplication via conditional changes to the the clang-from-llvm template procedure and inheritance. * Add a libomp-15 package. * Add a clang-toolchain-15 package. Thanks! Maxim Cournoyer (5): gnu: Add llvm-15. gnu: Add clang-runtime-15. gnu: Add clang-15. gnu: Add libomp-15. gnu: Add clang-toolchain-15. gnu/local.mk | 1 + gnu/packages/llvm.scm | 288 +++++++++++++----- .../patches/clang-15.0-libc-search-path.patch | 95 ++++++ 3 files changed, 303 insertions(+), 81 deletions(-) create mode 100644 gnu/packages/patches/clang-15.0-libc-search-path.patch base-commit: 5512915c3bd62e061bd47d440da02e0826c1d0e7 -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH v2 1/5] gnu: Add llvm-15. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 14:19:02 +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: ludo@gnu.org, Maxim Cournoyer Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.16686083295663 (code B ref 59237); Wed, 16 Nov 2022 14:19:02 +0000 Received: (at 59237) by debbugs.gnu.org; 16 Nov 2022 14:18:49 +0000 Received: from localhost ([127.0.0.1]:56444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFZ-0001TF-2e for submit@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:49 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:38834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFX-0001St-At for 59237@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:48 -0500 Received: by mail-qv1-f42.google.com with SMTP id o8so11963684qvw.5 for <59237@debbugs.gnu.org>; Wed, 16 Nov 2022 06:18:47 -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=jjvx1acHjAqfo83kydNEnsr6wsxeHlfTuiEzZoYhEno=; b=lRphehqktUXweGT/f9OgGLXlPzmYhfp5ubFltbVCCAjy2954wwfF/ZnHob/nCo3kjw KASKq3/vpfZUdhMsm/PcDchY+77u1nNHvJsQpbVBHW7JHYV4LM30p1T5C+JYQNx18ibq ndqzFuG7s3WPIY98zI+87s0TrYIYcWsNnIGOMy1j8IAeWzfExn9zQs4Bh4zaNh1l7xkF ZkpUpCwv8/ZwFy4dy/n6I6xXrkj0ehNz7NWuKiu3XaGVUuCt14SkBkIcPBRxbhly89op tyOHygp1Y/n9nHLlS19aKH0aOMNrMgvtuOvERA/jfQYHWznvdHIVMnkh6hsavkkjaEC1 iP0Q== 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=jjvx1acHjAqfo83kydNEnsr6wsxeHlfTuiEzZoYhEno=; b=amGqjOdxlxdy0uyXKcQPd++o+OAH1ArgzWyQ7SvFj4YDSNWjdpInvwRCOX0clI18mc DeIKg+qve2iOi38/dLmSqf2k5O5X18w1X99MusYvNMRstepRIcCQFFUxG4Sjr2mNOe9H qXHwbjKGaKX2UiDVGh/0gVg905xVBoNu8OATqVDyKJKg6WZ1d8aRz9DpcV1crFCUpLl9 DW5J22OKOfBkgu9rcSN5N/JCrHt2zh6Jx9/iqUFLpSWZWSbmjau0kr7dG8/FGM+rlLUZ zfRsrQDB47VLQWJ38Ft5LJA12rq3nkn0g04d9vrmK+i5YjNxyEO3KVocsp15RS//KoDS RMBg== X-Gm-Message-State: ANoB5pm7U/F7+bTDBLOgNKPm25+7EKduUsk+JFaWzSvcO0P4CO0dtHKR fgXhl8vXvkUK8e/RfpGS3yA2NxoIaT1MWw== X-Google-Smtp-Source: AA0mqf4eLN0OS4iUweV3p0ub3/S3zD6/l2fZaGSS6pMJlHzr7YbPYH56oTZ1lwE0AxiGGuiL6MNNjg== X-Received: by 2002:ad4:55e3:0:b0:4bc:13a3:9c82 with SMTP id bu3-20020ad455e3000000b004bc13a39c82mr20726108qvb.62.1668608321498; Wed, 16 Nov 2022 06:18:41 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-21.b2b2c.ca. [72.10.133.21]) by smtp.gmail.com with ESMTPSA id n16-20020a05620a295000b006b640efe6dasm10006660qkp.132.2022.11.16.06.18.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:18:41 -0800 (PST) From: Maxim Cournoyer Date: Wed, 16 Nov 2022 09:18:26 -0500 Message-Id: <20221116141830.12398-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116141830.12398-1-maxim.cournoyer@gmail.com> References: <20221116141830.12398-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (llvm-15): New variable. (llvm-14): Inherit from it, removing duplicated fields. * gnu/packages/patches/clang-15.0-libc-search-path.patch: New file. * gnu/local.mk: Register it. --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 93 +++++++++++++----- .../patches/clang-15.0-libc-search-path.patch | 95 +++++++++++++++++++ 3 files changed, 167 insertions(+), 22 deletions(-) create mode 100644 gnu/packages/patches/clang-15.0-libc-search-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 71472f8410..4fcaa6801a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -977,6 +977,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-12.0-libc-search-path.patch \ %D%/packages/patches/clang-13.0-libc-search-path.patch \ %D%/packages/patches/clang-14.0-libc-search-path.patch \ + %D%/packages/patches/clang-15.0-libc-search-path.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 324149116b..5a64c712af 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -545,10 +545,12 @@ (define (make-clang-toolchain clang libomp) ("libc-static" ,glibc "static"))))) (define %llvm-monorepo-hashes - '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx"))) + '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") + ("15.0.4" . "0j5kx4s970qzcjr83kk6776zzjqfshl61x9fagqz8kjxcjbpg8cj"))) (define %llvm-patches - '(("14.0.6" . ("clang-14.0-libc-search-path.patch")))) + '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) + ("15.0.4" . ("clang-15.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -560,20 +562,74 @@ (define (llvm-monorepo version) (sha256 (base32 (assoc-ref %llvm-monorepo-hashes version))) (patches (map search-patch (assoc-ref %llvm-patches version))))) -(define-public llvm-14 +;;; TODO: Make the base llvm all other LLVM inherit from on core-updates. +(define-public llvm-15 (package (name "llvm") - (version "14.0.6") + (version "15.0.4") (source (llvm-monorepo version)) (build-system cmake-build-system) (outputs '("out" "opt-viewer")) - (native-inputs - `(("python" ,python-wrapper) - ("perl" ,perl))) - (inputs - (list libffi)) - (propagated-inputs - (list zlib)) ;to use output from llvm-config + (arguments + (list + #:configure-flags + #~(list + ;; These options are required for cross-compiling LLVM according + ;; to . + #$@(if (%current-target-system) + #~((string-append "-DLLVM_TABLEGEN=" + #+(file-append this-package + "/bin/llvm-tblgen")) + #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" + (%current-target-system)) + #$(string-append "-DLLVM_TARGET_ARCH=" + (system->llvm-target)) + #$(string-append "-DLLVM_TARGETS_TO_BUILD=" + (system->llvm-target))) + '()) + ;; Note: sadly, the build system refuses the use of + ;; -DBUILD_SHARED_LIBS=ON and the large static archives are needed to + ;; build clang-runtime, so we cannot delete them. + "-DLLVM_BUILD_LLVM_DYLIB=ON" + "-DLLVM_LINK_LLVM_DYLIB=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" ;for some third-party utilities + "-DLLVM_INSTALL_UTILS=ON" ;needed for rustc + "-DLLVM_PARALLEL_LINK_JOBS=1") ;cater to smaller build machines + ;; Don't use '-g' during the build, to save space. + #:build-type "Release" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "llvm"))) + (add-after 'install 'install-opt-viewer + (lambda* (#:key outputs #:allow-other-keys) + (let* ((opt-viewer-share (string-append #$output:opt-viewer + "/share"))) + (mkdir-p opt-viewer-share) + (rename-file (string-append #$output "/share/opt-viewer") + opt-viewer-share))))))) + (native-inputs (list python-wrapper perl)) + (inputs (list libffi)) + (propagated-inputs (list zlib)) ;to use output from llvm-config + (home-page "https://www.llvm.org") + (synopsis "Optimizing compiler infrastructure") + (description + "LLVM is a compiler infrastructure designed for compile-time, link-time, +runtime, and idle-time optimization of programs from arbitrary programming +languages. It currently supports compilation of C and C++ programs, using +front-ends derived from GCC 4.0.1. A new front-end for the C family of +languages is in development. The compiler infrastructure includes mirror sets +of programming tools as well as libraries with equivalent functionality.") + (license license:asl2.0) + (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))))) + +(define-public llvm-14 + (package + (inherit llvm-15) + (version "14.0.6") + (source (llvm-monorepo version)) (arguments (list #:configure-flags @@ -613,17 +669,10 @@ (define-public llvm-14 (mkdir-p opt-viewer-share-dir) (rename-file (string-append out "/share/opt-viewer") opt-viewer-dir))))))) - (home-page "https://www.llvm.org") - (synopsis "Optimizing compiler infrastructure") - (description - "LLVM is a compiler infrastructure designed for compile-time, link-time, -runtime, and idle-time optimization of programs from arbitrary programming -languages. It currently supports compilation of C and C++ programs, using -front-ends derived from GCC 4.0.1. A new front-end for the C family of -languages is in development. The compiler infrastructure includes mirror sets -of programming tools as well as libraries with equivalent functionality.") - (license license:asl2.0) - (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))))) + + (native-inputs + `(("python" ,python-wrapper) + ("perl" ,perl))))) (define-public clang-runtime-14 (let ((template (clang-runtime-from-llvm llvm-14))) diff --git a/gnu/packages/patches/clang-15.0-libc-search-path.patch b/gnu/packages/patches/clang-15.0-libc-search-path.patch new file mode 100644 index 0000000000..20726859b2 --- /dev/null +++ b/gnu/packages/patches/clang-15.0-libc-search-path.patch @@ -0,0 +1,95 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on foreign distros. + +diff --git a/clang/lib/Driver/Distro.cpp b/clang/libDriver/Distro.cpp +index 1898667..35de813 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/libDriver/Distro.cpp +@@ -97,6 +97,10 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { + } + + static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) { ++ // The compiler should always behave the same, even when used via Guix on a ++ // foreign distro. ++ return Distro::UnknownDistro; ++ + Distro::DistroType Version = Distro::UnknownDistro; + + // Newer freedesktop.org's compilant systemd-based systems +diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/libDriver/ToolChains/Cuda.cpp +index 7ad990d..e4da4d4 100644 +--- a/clang/lib/Driver/ToolChains/Cuda.cpp ++++ b/clang/libDriver/ToolChains/Cuda.cpp +@@ -117,6 +117,9 @@ CudaInstallationDetector::CudaInstallationDetector( + const Driver &D, const llvm::Triple &HostTriple, + const llvm::opt::ArgList &Args) + : D(D) { ++ // Don't look for CUDA in /usr. ++ return; ++ + struct Candidate { + std::string Path; + bool StrictChecking; +diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/libDriver/ToolChains/Linux.cpp +index ceb1a98..9d7a14a 100644 +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/libDriver/ToolChains/Linux.cpp +@@ -188,6 +188,10 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + Generic_GCC::PushPPaths(PPaths); + ++ // Comment out the distro-specific tweaks so that they don't bite when ++ // using Guix on a foreign distro. ++#if 0 ++ + Distro Distro(D.getVFS(), Triple); + + if (Distro.IsAlpineLinux() || Triple.isAndroid()) { +@@ -256,6 +260,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + if (IsAndroid || Distro.IsOpenSUSE()) + ExtraOpts.push_back("--enable-new-dtags"); ++#endif + + // The selection of paths to try here is designed to match the patterns which + // the GCC driver itself uses, as this is part of the GCC-compatible driver. +@@ -276,6 +281,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + } + Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths); + ++#if 0 + addPathIfExists(D, concat(SysRoot, "/lib", MultiarchTriple), Paths); + addPathIfExists(D, concat(SysRoot, "/lib/..", OSLibDir), Paths); + +@@ -304,9 +310,11 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, concat(SysRoot, "/", OSLibDir, ABIName), Paths); + addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir, ABIName), Paths); + } ++#endif + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + ++#if 0 + // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs + // libc++.so in D.Dir+"/../lib/". Detect this path. + // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported. +@@ -316,6 +324,14 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + addPathIfExists(D, concat(SysRoot, "/lib"), Paths); + addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); ++#endif ++ ++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, ++ // and friends can be found. ++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); ++ ++ // Add GCC's lib/ directory so libstdc++.so can be found. ++ addPathIfExists(D, GCCInstallation.getParentLibPath(), Paths); + } + + ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const { -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH v2 2/5] gnu: Add clang-runtime-15. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 14:19:02 +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: ludo@gnu.org, Maxim Cournoyer Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.16686083345686 (code B ref 59237); Wed, 16 Nov 2022 14:19:02 +0000 Received: (at 59237) by debbugs.gnu.org; 16 Nov 2022 14:18:54 +0000 Received: from localhost ([127.0.0.1]:56448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFd-0001Td-RU for submit@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:54 -0500 Received: from mail-qv1-f41.google.com ([209.85.219.41]:35691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFY-0001Sx-I2 for 59237@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:48 -0500 Received: by mail-qv1-f41.google.com with SMTP id i12so11970115qvs.2 for <59237@debbugs.gnu.org>; Wed, 16 Nov 2022 06:18:48 -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=FmH3cX8p8fEcq5H4fZ613recdkfLgU4I9y+wA7jjhys=; b=CmfjcC4T3oqyILmHoztyHC3ZhvZ3KLhZWY/j4ZspWrHxH9B1Gi7WOSgfe6aS65MB3z XxUdaAp13L9R3GxdGHihZ8Ztg6o26bL0IqVL1meYgQqU1p8Nz1/jyY8jJB9AxFeia6Nh P5WbUT/8dGcNpcnDaMO6eHJPU0q43qZ9Et5MdXrqznJxi2/tIPoLCvr6lFi3Gu5YwmKN y9NR9lrusYflY3zWzfVz8Mdfu3DX5kRcsVTsiq70sFfB2ww6u9Lonny8DJ89q+mIbDRB 9A4vaDvpMCli8n5ACNszVg4YQO3nF9byioNS12wKwdOp/AStHlEqDhWaEPxYS2dWYNQm iDLQ== 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=FmH3cX8p8fEcq5H4fZ613recdkfLgU4I9y+wA7jjhys=; b=LGDnWGRGBVjD2l1pg8Qz7qoUGqx/+0be8AqsNv9qwZP8cZQ44usnLWau37d9C0dvda 2M19S5AHwu/DX0ZD7MrJkvB67DYhqdPWtKjbsXkvAXz+ho+4i9XM9AOlIOVfqP/odIUi I7Z45l6w8zMxYACEly1Go7hftewCG0WgHbNkTGvy17nAZOV2UYuEECCzBa/9MFrrFIhl p45kSRXKwqIssGXbe4mV4QkvTIfCY84QC/lJhiHC5/255AzuRRis0TIK5ACgrFkxRFPM p7UkO19fmFRKlRwKkZdv/o45NM/0DlOed2Omi1WOVBfd4sz9telWqy7JYC2rKNPQ5Nvn qSjg== X-Gm-Message-State: ANoB5pl/n97FR7C7bvmrswOMYB0nlFX/9tdYAD2YpgSnr4w5UqYF0nuf eW7VfGm/faqFOq/N6EttQxxBPKktTQYB1A== X-Google-Smtp-Source: AA0mqf4M7deBEZ0L+oCB4zDdHf0OvrrwIZCqtmw6cccO7+5Qkt5I4ffD6xLGOcT6DtDcgjyndBl6FQ== X-Received: by 2002:a05:6214:5652:b0:4bb:5669:fb53 with SMTP id mh18-20020a056214565200b004bb5669fb53mr21089495qvb.84.1668608322843; Wed, 16 Nov 2022 06:18:42 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-21.b2b2c.ca. [72.10.133.21]) by smtp.gmail.com with ESMTPSA id n16-20020a05620a295000b006b640efe6dasm10006660qkp.132.2022.11.16.06.18.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:18:42 -0800 (PST) From: Maxim Cournoyer Date: Wed, 16 Nov 2022 09:18:27 -0500 Message-Id: <20221116141830.12398-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116141830.12398-1-maxim.cournoyer@gmail.com> References: <20221116141830.12398-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (clang-runtime-15): New variable. --- gnu/packages/llvm.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 5a64c712af..9f4f64e0d0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -674,6 +674,29 @@ (define-public llvm-14 `(("python" ,python-wrapper) ("perl" ,perl))))) +(define-public clang-runtime-15 + (let ((template (clang-runtime-from-llvm llvm-15))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) + #~(modify-phases #$phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "compiler-rt"))) + (add-after 'install 'delete-static-libraries + ;; Reduce size from 33 MiB to 7.4 MiB. + (lambda _ + (for-each delete-file + (find-files #$output "\\.a(\\.syms)?$")))))))) + (native-inputs + (modify-inputs (package-native-inputs template) + (prepend gcc-12))) ;libfuzzer fails to build with GCC 11 + (inputs + (modify-inputs (package-inputs template) + (append libffi)))))) + (define-public clang-runtime-14 (let ((template (clang-runtime-from-llvm llvm-14))) (package -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH v2 3/5] gnu: Add clang-15. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 14:19: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: ludo@gnu.org, Maxim Cournoyer Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.16686083345695 (code B ref 59237); Wed, 16 Nov 2022 14:19:03 +0000 Received: (at 59237) by debbugs.gnu.org; 16 Nov 2022 14:18:54 +0000 Received: from localhost ([127.0.0.1]:56450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFe-0001Tf-4J for submit@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:54 -0500 Received: from mail-qk1-f174.google.com ([209.85.222.174]:34801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFZ-0001Sz-Qq for 59237@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:50 -0500 Received: by mail-qk1-f174.google.com with SMTP id 8so11683015qka.1 for <59237@debbugs.gnu.org>; Wed, 16 Nov 2022 06:18:49 -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=2mqrq2YRboY3ypFfnryZEinT8ccc4q/v4xzQGWhoPWQ=; b=BpaM+1BiORIKH1SuMVZTElpnH2x2pdl7FWXpMsJxM67bwo7CAL4APVhItqvfW8D+tg b2kz8OLBgE+Fwn6uYJFvgcpsR5wtH0qPJ9ZamfkXDesY3SWyUzQdfdxjA/tO8aOpwjO3 3iBuLaMqqMagwno7Yb8L4JEEvdDYcnTYTi0FvokuZAERvzKyUdStZ4vJj1umkIj7VGKv b/6NxF05IaYme8iZ3eEfqBo1E5n3L25Mk3izAwlpsYZ7WznA9fyE2Dlq73D+YE52Jft+ 52DB/qWLcyZlYw+ueaGui/fuTWRsnQwCs2UFQg+pC9VDi605duFbgqb0W5eKVGJMmD+V qRkQ== 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=2mqrq2YRboY3ypFfnryZEinT8ccc4q/v4xzQGWhoPWQ=; b=E1URh8gexN46UH9arQlrryUTUCZny3Pbpi5Pdj/TaaA0ppmvl2ikGNz+aw5enBosWd Pi91pzP4ssOWbm6pS8SmsNiN433Uh6QubfZI7Bxu2tKxQ3pK6AkYJl3bVjNeR4SnUB67 PmbDZJ79WggagxhWpgRoh+eiL65lnKUS20Ma1johDyxHbrliGbstlYNyTcJAHMYO/KpO LxKt60fBsz2pnl9wQj5wTnbOJgOC6hUJoEi5CSWSOk6gRyw4GmAzPpcVtRZKYBIHrvdM +QNNFyfjTQfEzyg6YeMpbCtuo7zaCsGyYizmAo4g6TR9C2XYLfx8MT+nSxA1ioiov4qF uUvw== X-Gm-Message-State: ANoB5plOBbPQzzKi6SFv/Y8hHExLW2Em8HR+0ci4YKXmWwItvdmK7Nee tlVKhAl+72PEqcPZwwlAjU5ybTgTfhY0Lw== X-Google-Smtp-Source: AA0mqf4JKnDyAxmVpWZSV40gA1wyhIdnFkmbiDbmIZ326Rs/bPEOagBwBPsYZQ8sYV124hLRYHKemQ== X-Received: by 2002:a37:554:0:b0:6fa:3f2c:c65e with SMTP id 81-20020a370554000000b006fa3f2cc65emr19102370qkf.326.1668608324022; Wed, 16 Nov 2022 06:18:44 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-21.b2b2c.ca. [72.10.133.21]) by smtp.gmail.com with ESMTPSA id n16-20020a05620a295000b006b640efe6dasm10006660qkp.132.2022.11.16.06.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:18:43 -0800 (PST) From: Maxim Cournoyer Date: Wed, 16 Nov 2022 09:18:28 -0500 Message-Id: <20221116141830.12398-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116141830.12398-1-maxim.cournoyer@gmail.com> References: <20221116141830.12398-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (clang-from-llvm): Add LEGACY-BUILD-SHARED-LIBS? argument and update doc. [configure-flags]: Conditionally add -DCLANG_LINK_CLANG_DYLIB=ON. [phases]{change-directory}: Conditionally add phase. {add-tools-extra}: Conditionally patch AddClang.cmake file. (clang-15): New variable. (clang-14): Streamline. (clang-13, clang-12, clang-11, clang-10, clang-9, clang-8, clang-7, clang-6) (clang-3.9.1, clang-3.8, clang-3.7, clang-3.5): Set LEGACY-BUILD-SHARED-LIBS? argument to #t. --- gnu/packages/llvm.scm | 96 +++++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 9f4f64e0d0..2b958b060e 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -176,11 +176,14 @@ (define* (clang-from-llvm llvm clang-runtime (properties (append `((release-monitoring-url . ,%llvm-release-monitoring-url)) - (clang-properties (package-version llvm))))) + (clang-properties (package-version llvm)))) + (legacy-build-shared-libs? #f)) "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." +'modularize', and other tools. LEGACY-BUILD-SHARED-LIBS? is used to configure +the package to use the legacy BUILD_SHARED_LIBS CMake option, which was used +until LLVM/Clang 14." (package (name "clang") (version (package-version llvm)) @@ -221,14 +224,17 @@ (define* (clang-from-llvm llvm clang-runtime (string-append "-DC_INCLUDE_DIRS=" (assoc-ref %build-inputs "libc") "/include") - ,@(if (target-riscv64?) - (list "-DLIBOMP_LIBFLAGS=-latomic" - "-DCMAKE_SHARED_LINKER_FLAGS=-latomic") - `())) + ,@(if (target-riscv64?) + (list "-DLIBOMP_LIBFLAGS=-latomic" + "-DCMAKE_SHARED_LINKER_FLAGS=-latomic") + `()) + ,@(if legacy-build-shared-libs? + '() + (list "-DCLANG_LINK_CLANG_DYLIB=ON"))) ,@(if (target-riscv64?) - `(#:make-flags '("LDFLAGS=-latomic")) - '()) + `(#:make-flags '("LDFLAGS=-latomic")) + '()) ;; Don't use '-g' during the build to save space. #:build-type "Release" @@ -247,9 +253,11 @@ (define* (clang-from-llvm llvm clang-runtime (string-delete #\- (package-version llvm)) ".src") "tools/extra") - ;; Build and link to shared libraries. - (substitute* "cmake/modules/AddClang.cmake" - (("BUILD_SHARED_LIBS") "True")) + ,@(if legacy-build-shared-libs? + ;; Build and link to shared libraries. + '((substitute* "cmake/modules/AddClang.cmake" + (("BUILD_SHARED_LIBS") "True"))) + '()) #t)))) '()) (add-after 'unpack 'add-missing-triplets @@ -323,6 +331,15 @@ (define* (clang-from-llvm llvm clang-runtime (("@GLIBC_LIBDIR@") (string-append libc "/lib")))))) #t))) + ;; 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 + ;; first after the unpack phase. + ,@(if (version>=? version "14") + '((add-after 'unpack 'change-directory + (lambda _ + (chdir "clang")))) + '()) ,@(if (version>=? version "10") `((add-after 'install 'adjust-cmake-file (lambda* (#:key outputs #:allow-other-keys) @@ -713,26 +730,31 @@ (define-public clang-runtime-14 ("gcc" ,gcc-11) ,@(package-native-inputs template)))))) +(define-public clang-15 + (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"))))) + (define-public clang-14 - (let ((template - (clang-from-llvm llvm-14 clang-runtime-14 - #:tools-extra - (origin - (method url-fetch) - (uri (llvm-uri "clang-tools-extra" - (package-version llvm-14))) - (sha256 - (base32 - "0rhq4wkmvr369nkk059skzzw7jx6qhzqhmiwmqg4sp66avzviwvw")))))) - (package - (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) - #~(modify-phases #$phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "clang")))))))))) + (clang-from-llvm + llvm-14 clang-runtime-14 + #:legacy-build-shared-libs? #t + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-14))) + (sha256 + (base32 + "0rhq4wkmvr369nkk059skzzw7jx6qhzqhmiwmqg4sp66avzviwvw"))))) + (define-public libomp-14 (package @@ -805,6 +827,7 @@ (define-public clang-runtime-13 (define-public clang-13 (clang-from-llvm llvm-13 clang-runtime-13 "1j8pr5kk8iqyb4jds3yl7c6x672617h4ngkpl4575j7mk4nrwykq" + #:legacy-build-shared-libs? #t #:patches '("clang-13.0-libc-search-path.patch") #:tools-extra (origin @@ -919,6 +942,7 @@ (define-public clang-runtime-12 (define-public clang-12 (clang-from-llvm llvm-12 clang-runtime-12 "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf" + #:legacy-build-shared-libs? #t #:patches '("clang-12.0-libc-search-path.patch") #:tools-extra (origin @@ -973,6 +997,7 @@ (define-public clang-runtime-11 (define-public clang-11 (clang-from-llvm llvm-11 clang-runtime-11 "02ajkij85966vd150iy246mv16dsaph1kfi0y8wnncp8w6nar5hg" + #:legacy-build-shared-libs? #t #:patches '("clang-11.0-libc-search-path.patch") #:tools-extra (origin @@ -1029,12 +1054,13 @@ (define-public clang-runtime-10 (define-public clang-10 (clang-from-llvm llvm-10 clang-runtime-10 "091bvcny2lh32zy8f3m9viayyhb2zannrndni7325rl85cwgr6pr" + #:legacy-build-shared-libs? #t #:patches '("clang-10.0-libc-search-path.patch") #:tools-extra (origin (method url-fetch) (uri (llvm-uri "clang-tools-extra" - (package-version llvm-10))) + (package-version llvm-10))) (sha256 (base32 "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh"))))) @@ -1098,6 +1124,7 @@ (define-public clang-runtime-9 (define-public clang-9 (clang-from-llvm llvm-9 clang-runtime-9 "0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p" + #:legacy-build-shared-libs? #t #:patches '("clang-9.0-libc-search-path.patch"))) (define-public libomp-9 @@ -1141,6 +1168,7 @@ (define-public clang-runtime-8 (define-public clang-8 (clang-from-llvm llvm-8 clang-runtime-8 "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh" + #:legacy-build-shared-libs? #t #:patches '("clang-8.0-libc-search-path.patch"))) (define-public libomp-8 @@ -1183,6 +1211,7 @@ (define-public clang-runtime-7 (define-public clang-7 (clang-from-llvm llvm-7 clang-runtime-7 "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9" + #:legacy-build-shared-libs? #t #:patches '("clang-7.0-libc-search-path.patch"))) (define-public libomp-7 @@ -1224,6 +1253,7 @@ (define-public clang-runtime-6 (define-public clang-6 (clang-from-llvm llvm-6 clang-runtime-6 "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w" + #:legacy-build-shared-libs? #t #:patches '("clang-6.0-libc-search-path.patch"))) (define-public libomp-6 @@ -1285,6 +1315,7 @@ (define-public clang-runtime-3.9.1 (define-public clang-3.9.1 (clang-from-llvm llvm-3.9.1 clang-runtime-3.9.1 "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76" + #:legacy-build-shared-libs? #t #:patches '("clang-3.8-libc-search-path.patch"))) (define-public llvm-3.8 @@ -1311,6 +1342,7 @@ (define-public clang-runtime-3.8 (define-public clang-3.8 (clang-from-llvm llvm-3.8 clang-runtime-3.8 "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc" + #:legacy-build-shared-libs? #t #:patches '("clang-3.8-libc-search-path.patch"))) (define-public llvm-3.7 @@ -1337,6 +1369,7 @@ (define-public clang-runtime-3.7 (define-public clang-3.7 (clang-from-llvm llvm-3.7 clang-runtime-3.7 "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn" + #:legacy-build-shared-libs? #t #:patches '("clang-3.5-libc-search-path.patch"))) (define-public llvm-3.6 @@ -1396,6 +1429,7 @@ (define-public clang-runtime-3.5 (define-public clang-3.5 (clang-from-llvm llvm-3.5 clang-runtime-3.5 "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg" + #:legacy-build-shared-libs? #t #:patches '("clang-3.5-libc-search-path.patch"))) ;; Default LLVM and Clang version. -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH v2 4/5] gnu: Add libomp-15. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 14:19: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: ludo@gnu.org, Maxim Cournoyer Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.16686083355701 (code B ref 59237); Wed, 16 Nov 2022 14:19:03 +0000 Received: (at 59237) by debbugs.gnu.org; 16 Nov 2022 14:18:55 +0000 Received: from localhost ([127.0.0.1]:56452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFe-0001To-OB for submit@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:55 -0500 Received: from mail-qk1-f173.google.com ([209.85.222.173]:43963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFa-0001T0-KS for 59237@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:51 -0500 Received: by mail-qk1-f173.google.com with SMTP id i9so11651912qki.10 for <59237@debbugs.gnu.org>; Wed, 16 Nov 2022 06:18:50 -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=knewoYUPye4EtPrsR2bfKapncUD9H0L6/PE2F3FfYLY=; b=VtPtzjydrwV+TDDpi/KuWwJGq+C+O1YMqYt1IldiN3wJxVO0Ic9CKjb4igZyqGgG5c GeDx4/lk8ollmkkhsw4xcsqqsU0Gc4x+WCkCrbuoW0/kcCuiR46EAsnm7pRMPYtfYdJT neK4IwXyQRHCfzTpvMx8t08zYIDbhL8rSYxUBUWaRS/Vecx+cLIv2Wz3kEm23q/cvTCp pUx8J46yc3PTBMJKfzjvds4pexwIOiFpmPpShTtEdmPRNGDNHyodvC5HbMS2qHPFjqJF 4g33y1bfHEgWr/jxZgPH7xLloMdOCcsYB5aJBV11yAT8E50tVCTAKJgMrVnr6bTBx2hb 7dNQ== 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=knewoYUPye4EtPrsR2bfKapncUD9H0L6/PE2F3FfYLY=; b=s+2mKwe3v4JYaGTtKfSVmJe8tIy+FOOdPidCfsmTNFNwCDxG39WWpN+ptHQIR+RQL2 frv42O74HjhhkcKlTB4k8wPbeRGYNMxOnujdnrH495dwSpKDLrBNRf7bhnawBJwhsDrq ZzJCa1G+yF8hjOLbQXzCM4VshdZzSwklcvf/zUzhA4Ey/LQtzOlzRYX7JWkul7sTrRmR S5vlQJ/eDBMJiSiyKaHj3qWA/V0n+FuaZlYKJmrrhTT49RUMYq/krRtd2kb1O6uXkkxp uSYkYNwh6KeOAefbTNG81oov8voazBSrmzVWAQt70+p7BpjVEwBuig2/FYhFUt84rDUq K4zw== X-Gm-Message-State: ANoB5pldZJz1OzjcB62IuUTlrWwflMbifsm6SmqS8jHRGlsgMrNY7ymP tZBeSGH4pccJUqQTUjsIcipW6gykYlkBVg== X-Google-Smtp-Source: AA0mqf6kUtBG+Yd56zwtJwVkQSBBlRgXLoDGpIUmg1bQfH6r6YuxGU3jMq9eINhI2hUfhw9q94SwYw== X-Received: by 2002:a37:a902:0:b0:6fa:2bd2:897f with SMTP id s2-20020a37a902000000b006fa2bd2897fmr19293451qke.87.1668608324969; Wed, 16 Nov 2022 06:18:44 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-21.b2b2c.ca. [72.10.133.21]) by smtp.gmail.com with ESMTPSA id n16-20020a05620a295000b006b640efe6dasm10006660qkp.132.2022.11.16.06.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:18:44 -0800 (PST) From: Maxim Cournoyer Date: Wed, 16 Nov 2022 09:18:29 -0500 Message-Id: <20221116141830.12398-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116141830.12398-1-maxim.cournoyer@gmail.com> References: <20221116141830.12398-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (libomp-15): New variable. (libomp-14): Inherit from it. [arguments]: Use substitute-keyword-arguments and override the chdir-to-source-and-install-license phase. Remove redundant fields. --- gnu/packages/llvm.scm | 75 ++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 2b958b060e..528c2bc359 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -755,10 +755,44 @@ (define-public clang-14 (base32 "0rhq4wkmvr369nkk059skzzw7jx6qhzqhmiwmqg4sp66avzviwvw"))))) +(define-public libomp-15 + (package + (name "libomp") + (version (package-version llvm-15)) + (source (llvm-monorepo version)) + (build-system cmake-build-system) + ;; XXX: Note this gets built with GCC because building with Clang itself + ;; fails (missing , even when libcxx is added as an input.) + (arguments + (list + #:configure-flags + #~(list "-DLIBOMP_USE_HWLOC=ON" + "-DOPENMP_TEST_C_COMPILER=clang" + "-DOPENMP_TEST_CXX_COMPILER=clang++") + #:test-target "check-libomp" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir-to-source-and-install-license + (lambda _ + (chdir "openmp") + (install-file "LICENSE.TXT" + (string-append #$output "/share/doc"))))))) + (native-inputs (list clang-15 llvm-15 perl pkg-config python)) + (inputs (list `(,hwloc "lib"))) + (home-page "https://openmp.llvm.org") + (synopsis "OpenMP run-time support library") + (description "This package provides the run-time support library developed +by the LLVM project for the OpenMP multi-theaded programming extension. This +package notably provides @file{libgomp.so}, which is has a binary interface +compatible with that of libgomp, the GNU Offloading and Multi Processing +Library.") + (properties `((release-monitoring-url . ,%llvm-release-monitoring-url) + (upstream-name . "openmp"))) + (license license:expat))) (define-public libomp-14 (package - (name "libomp") + (inherit libomp-15) (version (package-version llvm-14)) (source (origin (method url-fetch) @@ -767,36 +801,19 @@ (define-public libomp-14 (base32 "07zby3gwy5c8jssabrhjk3nsxlwipnm6sk4dsvck1l5d0br1ywsg")) (file-name (string-append "libomp-" version ".tar.xz")))) - (build-system cmake-build-system) - ;; XXX: Note this gets built with GCC because building with Clang itself - ;; fails (missing , even when libcxx is added as an input.) (arguments - (list - #:configure-flags #~(list "-DLIBOMP_USE_HWLOC=ON" - "-DOPENMP_TEST_C_COMPILER=clang" - "-DOPENMP_TEST_CXX_COMPILER=clang++") - #:test-target "check-libomp" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir-to-source-and-install-license - (lambda _ - (chdir #$(string-append "../openmp-" version ".src")) - (install-file "LICENSE.TXT" - (string-append #$output "/share/doc"))))))) + (substitute-keyword-arguments (package-arguments libomp-15) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'chdir-to-source-and-install-license + (lambda _ + (chdir #$(string-append "../openmp-" version ".src")) + (install-file "LICENSE.TXT" + (string-append #$output "/share/doc")))))))) (native-inputs - (list clang-14 llvm-14 perl pkg-config python)) - (inputs - (list `(,hwloc "lib"))) - (home-page "https://openmp.llvm.org") - (synopsis "OpenMP run-time support library") - (description - "This package provides the run-time support library developed by the LLVM -project for the OpenMP multi-theaded programming extension. This package -notably provides @file{libgomp.so}, which is has a binary interface compatible -with that of libgomp, the GNU Offloading and Multi Processing Library.") - (properties `((release-monitoring-url . ,%llvm-release-monitoring-url) - (upstream-name . "openmp"))) - (license license:expat))) + (modify-inputs (package-native-inputs libomp-15) + (replace "clang" clang-14) + (replace "llvm" llvm-14))))) (define-public clang-toolchain-14 (make-clang-toolchain clang-14 libomp-14)) -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH v2 5/5] gnu: Add clang-toolchain-15. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 14:19:04 +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: ludo@gnu.org, Maxim Cournoyer Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.16686083405718 (code B ref 59237); Wed, 16 Nov 2022 14:19:04 +0000 Received: (at 59237) by debbugs.gnu.org; 16 Nov 2022 14:19:00 +0000 Received: from localhost ([127.0.0.1]:56455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFk-0001UA-9G for submit@debbugs.gnu.org; Wed, 16 Nov 2022 09:19:00 -0500 Received: from mail-qk1-f182.google.com ([209.85.222.182]:34304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovJFf-0001TQ-L9 for 59237@debbugs.gnu.org; Wed, 16 Nov 2022 09:18:55 -0500 Received: by mail-qk1-f182.google.com with SMTP id 8so11683214qka.1 for <59237@debbugs.gnu.org>; Wed, 16 Nov 2022 06:18:55 -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=47SO+yKgOa0+K4I/b+mWleiouqs1T+PbRe2zeVC0bAg=; b=M46mlGRzl14oJw/UOJqn5sP/Li4CIwHqN0MZsVipOIa/rFQd/RSoWxCo34EbzIHP4r u6UogBh/GKNFpAeT/DOAu3awGokjRNpfRjHxwpTim6oC5Xvj6NgGCYNd/2i4+WbS4BvT nQDbm/GcT7nN22U0nIMvp5ydkS+xIpaJPTwmtIpjQEIgk50FdaSZ77TQZuYaoWL547Sx k9mSglBke73czQ3TZxPmGdZsyHwKedcW8yHHWhV0foII1p7Z+232xrN+FRMWQ/83QoN1 HyR6DBT1+oCZB//c4QpvNa8oZvEatso79HqGzIaqBooaetA93jim8N6mI3XOe+CkKFhz i6TA== 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=47SO+yKgOa0+K4I/b+mWleiouqs1T+PbRe2zeVC0bAg=; b=gj08qTJWUAPgk4AqGnDkDa6acPpKTFh+E5iMuRRi8yonXW0KqEEOEcm3wlPVNluPyx 2oqRLbBhXpUOOxYoL1iNmeER7zn3jmyI1ydX0LS0r6i5OTfPUUxRwnR7r9Kdff51YdNI GO4elWAkzGMZ0bY8ybDa298wLlAr4SWDtpOOujhKWOXDi+0lVgWqAjsNPqMH/PU173Ll upSCBE4vwWGVpv7+CNbJQyTgOcbRHAYSQULm+nZw/dsN1sL1NQKn6t5Vc1/25saDSKDj a+y4QnFV2WtnMy1lopJ4HubPQyRz6pf5v+qrBzqnoITFmkOHy8e5nX00DEKCm1JUsuzU XmHA== X-Gm-Message-State: ANoB5pmU8VJDdOx++Y+g2oKHV1Rf+C/aiWCBc5TlzLCis5hGJ9Mb1JQp sFQQZV19cSqfO4OKYy1HXU0ZxNo2ZW9hdw== X-Google-Smtp-Source: AA0mqf79rqkS1f9IOh0+Y9A9uEUlTVysbO8/jKjGjlP8/hRSJ9Mqa6yvauF4LJikYoEJ/1lm+rWx6Q== X-Received: by 2002:ae9:eb4d:0:b0:6fa:35d5:eb25 with SMTP id b74-20020ae9eb4d000000b006fa35d5eb25mr18754268qkg.400.1668608326066; Wed, 16 Nov 2022 06:18:46 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-21.b2b2c.ca. [72.10.133.21]) by smtp.gmail.com with ESMTPSA id n16-20020a05620a295000b006b640efe6dasm10006660qkp.132.2022.11.16.06.18.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:18:45 -0800 (PST) From: Maxim Cournoyer Date: Wed, 16 Nov 2022 09:18:30 -0500 Message-Id: <20221116141830.12398-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116141830.12398-1-maxim.cournoyer@gmail.com> References: <20221116141830.12398-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (clang-toolchain-15): New variable. --- gnu/packages/llvm.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 528c2bc359..d315149c42 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -790,6 +790,9 @@ (define-public libomp-15 (upstream-name . "openmp"))) (license license:expat))) +(define-public clang-toolchain-15 + (make-clang-toolchain clang-15 libomp-15)) + (define-public libomp-14 (package (inherit libomp-15) -- 2.38.1 From unknown Sun Jun 22 08:07:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59237] [PATCH 0/3] Add LLVM/Clang 15.0.4. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 15:22:02 +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: Maxim Cournoyer Cc: 59237@debbugs.gnu.org Received: via spool by 59237-submit@debbugs.gnu.org id=B59237.166861209213112 (code B ref 59237); Wed, 16 Nov 2022 15:22:02 +0000 Received: (at 59237) by debbugs.gnu.org; 16 Nov 2022 15:21:32 +0000 Received: from localhost ([127.0.0.1]:57880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovKEG-0003PQ-Iz for submit@debbugs.gnu.org; Wed, 16 Nov 2022 10:21:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovKEB-0003P9-RL for 59237@debbugs.gnu.org; Wed, 16 Nov 2022 10:21:31 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovKE6-00031m-KB; Wed, 16 Nov 2022 10:21:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=v5wCJpgPUqSlm9mRo9TKNv+vZI0FOb8ii4+Ay4iYIfI=; b=dn7l37Nwc9Lw/A6Dfowv PwykPGtx/dw06zmyISX4e7c3EimQbLcbkvatGKs25NJLjwt/cMH2gdWPQjV4w/smmecmn4iGd6D2b moqaaocnmau8reltgIPfnpmuF9pwMdW8gLmtKw7ht0TMNWBjPLv5oaqdptyI94xX9RejuAUXJbtHG JwcIzc6u097SHF3jKq1LOVoiLsb+22nBwAft9Rbldu7aTZJGuBsbbvOSdnukZvucx+TxZTztshuVL pQGshqOEx0Z7bCFM+2jvQCGTI5d/tYuMl8Lznj8vayIKaV1wJYEgviRrL8HkNy8mBXgWeZA9AnOgM YoyVvXVL+zagvg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovKE6-0004GL-7B; Wed, 16 Nov 2022 10:21:22 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20221113045354.26955-1-maxim.cournoyer@gmail.com> <20221116141830.12398-1-maxim.cournoyer@gmail.com> Date: Wed, 16 Nov 2022 16:21:19 +0100 In-Reply-To: <20221116141830.12398-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Wed, 16 Nov 2022 09:18:25 -0500") Message-ID: <87a64rkjrk.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Maxim, Maxim Cournoyer skribis: > This v2 series includes the following changes the following changes, base= d on > Ludovic's review: > > * Reduce code duplication via conditional changes to the the clang-from-l= lvm > template procedure and inheritance. > * Add a libomp-15 package. > * Add a clang-toolchain-15 package. Perfect, LGTM! Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 08:07:55 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Maxim Cournoyer Subject: bug#59237: closed (Re: bug#59237: [PATCH 0/3] Add LLVM/Clang 15.0.4.) Message-ID: References: <87v8neiubk.fsf@gmail.com> <20221113045354.26955-1-maxim.cournoyer@gmail.com> X-Gnu-PR-Message: they-closed 59237 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 59237@debbugs.gnu.org Date: Wed, 16 Nov 2022 19:17:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1668626221-20578-1" This is a multi-part message in MIME format... ------------=_1668626221-20578-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #59237: [PATCH 0/3] Add LLVM/Clang 15.0.4. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 59237@debbugs.gnu.org. --=20 59237: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D59237 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1668626221-20578-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 59237-done) by debbugs.gnu.org; 16 Nov 2022 19:16:24 +0000 Received: from localhost ([127.0.0.1]:58165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovNtX-0005Kt-Np for submit@debbugs.gnu.org; Wed, 16 Nov 2022 14:16:23 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:44017) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovNtW-0005Kg-Fi for 59237-done@debbugs.gnu.org; Wed, 16 Nov 2022 14:16:22 -0500 Received: by mail-qt1-f170.google.com with SMTP id a27so11331892qtw.10 for <59237-done@debbugs.gnu.org>; Wed, 16 Nov 2022 11:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=7kyoKvZHiPSSVmlb7TgUV42bw9h/WbIteLrBI78XBK8=; b=F0poQ8ph7f4Dn2mT8avSQft4QzTNFDv+48ExCAktGOFOwrHcadiXxAnteCSTSL+i4P eEd10SfN7pBfOHRYbV+ulN8DQqsKXneeoHcFepxXLbz0Dk79m1ckyxP4KEM8IsuKZYPM HgqSO3PwUJFd+LLEPTGRoCfSf8zwzE9MKhzxBZu6OE6MvbF9amdYgoe65KBP+hN16U5W ZCIb8R18Sh72PBkdX+AOvvaocsztMHZFyu0DyVHLwKk0ZS7GPpQ5L71jHMDz1tKoKsY9 Uj4BuyGnAblKbO12Se+Vv1OYgU5wOEkmhG+3Yu2e92LyARdziEqhaNYBfGl+xqwFXkJW dLEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7kyoKvZHiPSSVmlb7TgUV42bw9h/WbIteLrBI78XBK8=; b=sOuRlkiWevLyiPRnqrvb1j1XDXoJus9ZFsxIflz0ReqsET8Us5NJchBkoWlfZpQwh/ VusxvhKIuHJ1D1psOnwJGwwfoevPx5VQ8DZxJb6RtvozhxQKhvNUWOLRmozS8lrFOr3j TV3SpOt1XisPG7x+BHvotM/j2euRRcowubFU90hsdOyGvAjd/fZYkR93JvDs5CNbvur6 3C0Fj2mM1OXEDZ+acCtquuySBqFpP8tPBA+k5jRcUqhYMWXk7tg52DrTaeale+aUVuTP HSDxdjjnYpmyiSt/peUZXoN8KSfWwCq/4OirsewN/eDZc3WdZPTzXp0PHO8WpBoFhhJg JKjg== X-Gm-Message-State: ANoB5plZm8MCIQpwSs8GGK9gc4BbCN5nIEd5xQvldS58hIHeP8XGLtC2 tV6talWZBZd0lJQRIuwCXZPXQs/I73+xDw== X-Google-Smtp-Source: AA0mqf7ysSqTBV5kzDxCw5CMB8oxLN67GeRxO7DAGK/i7JyTz2CCWbLNOTV82kqfQ2ZTYkjYLQFI7w== X-Received: by 2002:a05:622a:1902:b0:3a5:291d:8dc0 with SMTP id w2-20020a05622a190200b003a5291d8dc0mr22539881qtc.274.1668626176746; Wed, 16 Nov 2022 11:16:16 -0800 (PST) Received: from hurd (dsl-10-133-21.b2b2c.ca. [72.10.133.21]) by smtp.gmail.com with ESMTPSA id q45-20020a05620a2a6d00b006ee7923c187sm10796261qkp.42.2022.11.16.11.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 11:16:16 -0800 (PST) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#59237: [PATCH 0/3] Add LLVM/Clang 15.0.4. References: <20221113045354.26955-1-maxim.cournoyer@gmail.com> <20221116141830.12398-1-maxim.cournoyer@gmail.com> <87a64rkjrk.fsf_-_@gnu.org> Date: Wed, 16 Nov 2022 14:16:15 -0500 In-Reply-To: <87a64rkjrk.fsf_-_@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s?= =?utf-8?Q?=22's?= message of "Wed, 16 Nov 2022 16:21:19 +0100") Message-ID: <87v8neiubk.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59237-done Cc: 59237-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Ludovic Court=C3=A8s writes: > Hi Maxim, > > Maxim Cournoyer skribis: > >> This v2 series includes the following changes the following changes, bas= ed on >> Ludovic's review: >> >> * Reduce code duplication via conditional changes to the the clang-from-= llvm >> template procedure and inheritance. >> * Add a libomp-15 package. >> * Add a clang-toolchain-15 package. > > Perfect, LGTM! Pushed with 83fb681658431362def447ec29876d565d49c9e5. --=20 Thanks, Maxim ------------=_1668626221-20578-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Nov 2022 04:54:04 +0000 Received: from localhost ([127.0.0.1]:49797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou50N-00034t-Rx for submit@debbugs.gnu.org; Sat, 12 Nov 2022 23:54:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:33242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ou50M-00034b-40 for submit@debbugs.gnu.org; Sat, 12 Nov 2022 23:54:03 -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 1ou50L-0007WF-VB for guix-patches@gnu.org; Sat, 12 Nov 2022 23:54:01 -0500 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ou50K-0002aN-IM for guix-patches@gnu.org; Sat, 12 Nov 2022 23:54:01 -0500 Received: by mail-qv1-xf36.google.com with SMTP id x13so6037120qvn.6 for ; Sat, 12 Nov 2022 20:54:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NEmbVkXM5FmyYBcDEgrRn50PmCOqz9ODV/XWwk9WSdY=; b=LAmHcJ6gTj9Y6Hb76SJb7nKW7peLffig36XJA8B2QVzvz2RNply2VlnWU6AqoiQnR5 8lZni+88I9Qhspxb79/mIyS3V0SSV4tlTXmJFGB1Jo5/KymGycfiYMHxL5cfvr4MQTNf 3wuRkH4R8tT97kMmuAZ+ciw/SJtxQbOFUJ1o+eqQpaMIj9IqccD7evsSUmn5AdXBGPkF 3IWdrOTfwXvjk/VjFleaeo4VNds9nz5ZuvuzuYZd5pmaq9CQNYg3Fwes7yygNqq3/Z6C SAj+jiTnFmK1hp99Ipn4dLI3rXfDeimdl40mWS+M4JD5VCUo/aJji2LhbEKvSPUVjDUy 5ERg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NEmbVkXM5FmyYBcDEgrRn50PmCOqz9ODV/XWwk9WSdY=; b=cAeReEccyZzLoCyePgPcoq4rbFoA8OK1Gfqw5g8XYiL/1pjhmWmfkZA/2wxcik6UBM 4RM1iBSTlQ53m1qIEsxUfgWjh5DzHmUi3/kuHmQGoNnQu3aFFjlhcW+9bW/ZsKieRvzJ qcnSECFASV9SXRUjg99LdAbwI8R42cA3ayzsLabJmGCgTXnzjbKf5KhVZ0L8YGDgeS8D YCa/r/MuAXxhyBqboeq3KRtau1Kxz2qO2b79uFG0e6+deClhsCC7xalrdCRbbY8Skhit PVj9sX4cMD0ysB4GNn3/jPN+ZN+xyTG210NNM13SGRKxWF3p+hvvfhWdyHnPM8sCOkRQ m93Q== X-Gm-Message-State: ANoB5pn4OcqC22fkHP+AOmOKU2xbHivqatKyfGArprb0R9Z8zpenitLM cklpDox6Jc0SutjGm9vGlYNhMXjo0Aw= X-Google-Smtp-Source: AA0mqf4fxJhR5wnfDF918qOU7/F03AmmSrrQfsaV8ofqCPMuA75SFUlVwIltK7SIMTbsh1z182sDRQ== X-Received: by 2002:a0c:f849:0:b0:4bb:699e:4cec with SMTP id g9-20020a0cf849000000b004bb699e4cecmr8269091qvo.6.1668315239341; Sat, 12 Nov 2022 20:53:59 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id j11-20020a05620a410b00b006cbc00db595sm4360350qko.23.2022.11.12.20.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:53:58 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH 0/3] Add LLVM/Clang 15.0.4. Date: Sat, 12 Nov 2022 23:53:54 -0500 Message-Id: <20221113045354.26955-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f36; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf36.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi Guix, This adds the latest clang, build with the supported configuration for a shared library (DYLIB), and with some size reduction via stripping static archives where possible. Maxim Cournoyer (3): gnu: Add llvm-15. gnu: Add clang-runtime-15. gnu: Add clang-15. gnu/local.mk | 1 + gnu/packages/llvm.scm | 153 +++++++++++++++++- .../patches/clang-15.0-libc-search-path.patch | 95 +++++++++++ 3 files changed, 247 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/clang-15.0-libc-search-path.patch -- 2.38.1 ------------=_1668626221-20578-1--