From patchwork Sat Jul 16 19:48:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 40702 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 CDBDD27BBEA; Sat, 16 Jul 2022 20:49:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 4DEDC27BBE9 for ; Sat, 16 Jul 2022 20:49:49 +0100 (BST) Received: from localhost ([::1]:47186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCnnQ-000500-EJ for patchwork@mira.cbaines.net; Sat, 16 Jul 2022 15:49:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCnmj-0004X0-O6 for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCnmj-0004hw-Dx for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCnmj-0005JC-AB for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v3 10/10] gnu: Add libcxxabi-12. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 19:49:05 +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.165800091120299 (code B ref 54239); Sat, 16 Jul 2022 19:49:05 +0000 Received: (at 54239) by debbugs.gnu.org; 16 Jul 2022 19:48:31 +0000 Received: from localhost ([127.0.0.1]:46166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnmA-0005HG-KV for submit@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:31 -0400 Received: from lepiller.eu ([89.234.186.109]:44374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm3-0005FA-I2 for 54239@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:24 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a5259a7c for <54239@debbugs.gnu.org>; Sat, 16 Jul 2022 19:48:17 +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=jb/y/m0ttQEhHD30+NAaXqVkB ff9mHSQFebkZj3l27w=; b=fcLliNHZfyAFykv+P8XyBrAMFhZsadqn8ER6LK28m AiakNQh2dCZIoKE4P5A0yF5UMGsqePsn2SZ7UWUV1qHdbWEp9gS8FvgF7nOB5RJn wv4XDGIEMWHgybCv8Gs8tk9fRo5JjM4SrqEuEoetvLbIOiptNr9ByATbhwIUheAL vCBJi+EnWGXqVIS+nupQvdydqE4aPYCHJSndO37lUE4UBPzvpjX54rJvhtB522zJ sKazehWNG+SykcokIERn7vLNGVF/D3sFGzEIgRL+kr2oipjbee3fE+dnXBrGyDhS hCd32gfDUSaBj2Tv9qmH69yJ0pbEw5ARp+ccXlXFh+GQQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e57c4f88 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <54239@debbugs.gnu.org>; Sat, 16 Jul 2022 19:48:16 +0000 (UTC) From: Julien Lepiller Date: Sat, 16 Jul 2022 21:48:07 +0200 Message-Id: <20220716194807.20378-10-julien@lepiller.eu> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220716194807.20378-1-julien@lepiller.eu> References: <20220716214424.1d521d65@sybil.lepiller.eu> <20220716194807.20378-1-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-12): New variable. (libcxxabi-9): Inherit from it. --- gnu/packages/llvm.scm | 53 +++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 4f0b57a990..72fef43a5f 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1707,17 +1707,17 @@ (define-public libcxx-6 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) (inputs (list llvm-6)))) -(define-public libcxxabi-9 +(define-public libcxxabi-12 (package (name "libcxxabi") - (version (package-version clang-9)) + (version (package-version clang-12)) (source (origin (method url-fetch) - (uri (llvm-uri "libcxxabi" version)) + (uri (llvm-uri "llvm-project" version)) (sha256 (base32 - "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8")))) + "03ps7akvbkxxa4xzal49v7lw3bz41zmjsp6fa7cslxrns5fb570j")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1728,6 +1728,9 @@ (define-public libcxxabi-9 "-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) @@ -1773,14 +1776,10 @@ (define (delete* what lst) (let ((include-dir (string-append (assoc-ref outputs "out") "/include"))) (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-9)) - (native-inputs (list (clang-for-target clang-9))) + (install-file "../libcxxabi/include/__cxxabi_config.h" include-dir) + (install-file "../libcxxabi/include/cxxabi.h" include-dir))))))) + (inputs (list llvm-12 libcxx-12)) + (native-inputs (list (clang-for-target clang-12) python)) (home-page "https://libcxxabi.llvm.org") (synopsis "C++ standard library support") (description @@ -1788,6 +1787,36 @@ (define (delete* what lst) standard C++ library.") (license license:expat))) +(define-public libcxxabi-9 + (package + (inherit libcxxabi-12) + (version (package-version clang-9)) + (source + (origin + (method url-fetch) + (uri (llvm-uri "libcxxabi" version)) + (sha256 + (base32 + "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8")))) + (arguments + (substitute-keyword-arguments (package-arguments libcxxabi-12) + ((#:phases phases) + `(modify-phases ,phases + (delete 'chdir) + (replace 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (let ((include-dir (string-append + (assoc-ref outputs "out") "/include"))) + (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-9)) + (native-inputs (list (clang-for-target clang-9))))) + (define-public libcxxabi-6 (package (inherit libcxxabi-9)