From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kFejAWUW02JBUQAAbAwnHQ (envelope-from ) for ; Sat, 16 Jul 2022 21:49:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id UcWNAGUW02KaGQAAG6o9tA (envelope-from ) for ; Sat, 16 Jul 2022 21:49:57 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7A98138CFF for ; Sat, 16 Jul 2022 21:49:50 +0200 (CEST) Received: from localhost ([::1]:47186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCnnR-000500-Ls for larch@yhetil.org; Sat, 16 Jul 2022 15:49:49 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658000996; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/J8h7m7gJzZiue8laDbqS5o5jg4qUXLpraEWmFb1y+w=; b=Czp7GPs9Dl47l5kZ1I3jcFHfp+kkDecgvCmy0X/P8u5RetyglMWXJEsgWypUJTE+7Pjl3G 8xL0fN97imhumvZZ6Xg+av6MCxGG64WNEwA8QcP8C3+15Np0VXSEp6YPGNlVEN6rzmWDL1 QLrVttvCAlEOsYISprvoCc7i06gh9zXq+GR6gbY7USHpuxMQZclLnjMK0x+1Yp6OeSGZzk 2oXR4aGiK/kFDr2SXiF4AtiICSfnncROro853AJJUZvku564k27hMNEYuJiq/HTQWiXSFU XqWJDQp6qLbouqlF1kAnoeqKqAfbKSruyJPdr6y4s1N0GW7WXZEUlxZSfy9qwg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658000996; a=rsa-sha256; cv=none; b=ZActcPmdB+fthz5HwCei2Sycsp6V1XLdF5lv7SpDwA82RbWD9lA3zP9YRGenxBuPRJiXcn dk51ednzA40EySe2O5y9ddQURQr2RrspWSonbJLDtmbAfivduNyUA65cFBCliEAPHJIE+s CZEQj9VfKQqKME1Pnoqy2HcGe0aiLJrpElh2nphuncGahSZtVkhGWF1FaOqGGwc43bi7ay Ipe3PWfNeABz+2AZxZOYGaELkw06PTSztA4lJJnLFyLW32yUkC26d1Px1/04y3Z62twJRs gSyTr7Ue6IVEY6XX9jWG9m2sgSbCaoO1Z73cIz2ePSNKUVgDnobs9M1fQFokOw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=fcLliNHZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.56 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=fcLliNHZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 7A98138CFF X-Spam-Score: 7.56 X-Migadu-Spam: Yes X-Migadu-Scanner: scn1.migadu.com X-TUID: qmK0SadDjxGw * 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) -- 2.37.0