From patchwork Thu Mar 3 16:07:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 37593 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D627A27BBEA; Thu, 3 Mar 2022 16:17:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5572027BBE9 for ; Thu, 3 Mar 2022 16:17:06 +0000 (GMT) Received: from localhost ([::1]:50442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPo8X-0003gm-Db for patchwork@mira.cbaines.net; Thu, 03 Mar 2022 11:17:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo0m-0006yO-75 for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPo0l-00087A-UX for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPo0l-0000WW-PM for guix-patches@gnu.org; Thu, 03 Mar 2022 11:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH 5/5] gnu: Add libcxxabi-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Mar 2022 16:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54239@debbugs.gnu.org Received: via spool by 54239-submit@debbugs.gnu.org id=B54239.16463236901917 (code B ref 54239); Thu, 03 Mar 2022 16:09:03 +0000 Received: (at 54239) by debbugs.gnu.org; 3 Mar 2022 16:08:10 +0000 Received: from localhost ([127.0.0.1]:43507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzu-0000Um-7c for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:10 -0500 Received: from lepiller.eu ([89.234.186.109]:57048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPnzr-0000UA-11 for 54239@debbugs.gnu.org; Thu, 03 Mar 2022 11:08:07 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2b59e5da for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=nx1SD4DivmfbsFfXPirGZOEIj a0iA/Dao6gRnqp6uKY=; b=jeN0AaigxijPXONyY2xWpCiGUDedL/X+5BDljN7dN +d/9g8t9vIiaDYEF7nbuxKqIlGRuSfsAlF7jXroAiTY9EqRtWOlOZrhNbJCxr2YB RGPcWvONQ+43dQSIOGH8wPXWWxw6aOwxg57wTgYM+2yJNvMRCoC1MV/5AMaifDOq D3Lz9ofS+YpU1bUU6VbDpQANF+JBKFiMjwDDHB3tnJyMPaGY+mXKyC4lvMLm5Owr qCVpoZZzMCFFoWWz/2RB8P1MimasZTyX9ApwVVSlL/6uj9uLua6ekSvywviXHakK cJaIXgxAc1c7KvpU/BkMY1k3kJFhQ9gyFVQ6pC6I6aDBA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id de4e849a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Thu, 3 Mar 2022 16:08:01 +0000 (UTC) From: Julien Lepiller Date: Thu, 3 Mar 2022 17:07:47 +0100 Message-Id: <4f9bdee16d84acc93f51a0f1a73149366de2b818.1646322873.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu> References: <499e5dba47ef40df93a8b33fbb8e41cc2354e7a1.1646322873.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (libcxxabi-9): New variable. (libcxxabi-6): Inherit from it. --- gnu/packages/llvm.scm | 72 +++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 63b55ef3df..f1631bbe70 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1396,20 +1396,17 @@ (define-public libcxx-6 (cross-clang (%current-target-system) #:clang clang-6) clang-6))))) -(define-public libcxxabi-6 +(define-public libcxxabi-9 (package (name "libcxxabi") - (version "6.0.1") + (version (package-version clang-9)) (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/llvm/llvm-project") - (commit (string-append "llvmorg-" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (llvm-uri "libcxxabi" version)) (sha256 (base32 - "0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g")))) + "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1420,8 +1417,6 @@ (define-public libcxxabi-6 "-DCMAKE_CXX_COMPILER=clang++") #:phases (modify-phases (@ (guix build cmake-build-system) %standard-phases) - (add-after 'unpack 'chdir - (lambda _ (chdir "libcxxabi"))) (add-after 'unpack 'adjust-CPLUS_INCLUDE_PATH (lambda* (#:key inputs native-inputs #:allow-other-keys) (define (delete* what lst) @@ -1455,10 +1450,10 @@ (define-public libcxxabi-6 (string-append gcc "/include/c++")) (string-split (getenv "CROSS_CPLUS_INCLUDE_PATH") #\:))) - ":")) - (format #true - "environment variable `CROSS_CPLUS_INCLUDE_PATH' changed to ~a~%" - (getenv "CROSS_CPLUS_INCLUDE_PATH"))) + ":"))) + (format #true + "environment variable `CROSS_CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CROSS_CPLUS_INCLUDE_PATH")) (format #true "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" (getenv "CPLUS_INCLUDE_PATH"))))) @@ -1466,13 +1461,19 @@ (define-public libcxxabi-6 (lambda* (#:key outputs #:allow-other-keys) (let ((include-dir (string-append (assoc-ref outputs "out") "/include"))) - (install-file "../libcxxabi/include/__cxxabi_config.h" include-dir) - (install-file "../libcxxabi/include/cxxabi.h" include-dir))))))) - (inputs (list llvm-6 libcxx-6)) + (mkdir-p include-dir) + (install-file ,(string-append "../libcxxabi-" version + ".src/include/__cxxabi_config.h") + include-dir) + (install-file ,(string-append "../libcxxabi-" version + ".src/include/cxxabi.h") + include-dir))))))) + (inputs + (list llvm-9 libcxx)) (native-inputs (list (if (%current-target-system) - (cross-clang (%current-target-system) #:clang clang-6) - clang-6))) + (cross-clang (%current-target-system) #:clang clang-9) + clang-9))) (home-page "https://libcxxabi.llvm.org") (synopsis "C++ standard library support") (description @@ -1480,6 +1481,39 @@ (define-public libcxxabi-6 standard C++ library.") (license license:expat))) +(define-public libcxxabi-6 + (package + (inherit libcxxabi-9) + (name "libcxxabi") + (version "6.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/llvm/llvm-project") + (commit (string-append "llvmorg-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g")))) + (arguments + (substitute-keyword-arguments (package-arguments libcxxabi-9) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'chdir + (lambda _ (chdir "libcxxabi"))) + (replace 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (let ((include-dir (string-append + (assoc-ref outputs "out") "/include"))) + (install-file "../libcxxabi/include/__cxxabi_config.h" include-dir) + (install-file "../libcxxabi/include/cxxabi.h" include-dir)))))))) + (inputs (list llvm-6 libcxx-6)) + (native-inputs + (list (if (%current-target-system) + (cross-clang (%current-target-system) #:clang clang-6) + clang-6))))) + (define-public libcxx+libcxxabi-6 (package (inherit libcxx-6)