From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 gDCbLHYW02IXPwAAbAwnHQ (envelope-from ) for ; Sat, 16 Jul 2022 21:50:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yM+9LHYW02IrIwEA9RJhRA (envelope-from ) for ; Sat, 16 Jul 2022 21:50:14 +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 4D2E138D6B for ; Sat, 16 Jul 2022 21:50:14 +0200 (CEST) Received: from localhost ([::1]:48522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCnnp-0005tE-Fo for larch@yhetil.org; Sat, 16 Jul 2022 15:50:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCnmj-0004Ud-0i for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCnmi-0004hf-O4 for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oCnmi-0005Ix-KT for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v3 08/10] gnu: Add libcxxabi-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jul 2022 19:49:04 +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.165800091020286 (code B ref 54239); Sat, 16 Jul 2022 19:49:04 +0000 Received: (at 54239) by debbugs.gnu.org; 16 Jul 2022 19:48:30 +0000 Received: from localhost ([127.0.0.1]:46162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm9-0005H1-LP for submit@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:30 -0400 Received: from lepiller.eu ([89.234.186.109]:44374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm2-0005FA-31 for 54239@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:23 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 4feec0cf 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=mfBifTFxJgElbejpd2Lyi6Rxs 0GYMbhtAP5htYpiVBM=; b=Bba6IFL35zc2nLeMHMA4IjtXjavhL1LXv8ONvrGbd IjFuNtlbODMSooQD5STK/XyFU3DTN1xCtjPpb3A0IizZUaQbb8Q4QciBZO7hPkBP c8CLUqsVGOd7IlqqD03f8dCYdBmuL5UTAZR68eIpqp8YgKiCvK8jjn/qdjow+DKk jDpr61X6zDfwc1IewrU7CaHeYSyLvbe+MQVR1Dbza/EzwGitnVqaEKwkt3BqzEcr Q56s/sqxHTQNKZR0EyzLKXfQM6iS67XNTF6vEgKE8AI3Lrc+QTqMQjYn3yIpNmBg dqdpvsXoW7Pl62KZD4tmxjgQTmo5T3vaP7Wu31i7RszVA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 39397325 (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:05 +0200 Message-Id: <20220716194807.20378-8-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=1658001014; 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=3IgnbleRhdPoMySuwu2Pc54R49GDc/bbjtXkb5NImV0=; b=es1LZp+WKUAv7uPXfDLArGHjjcioF8wdCi09lrniKN0BdjhEMyz9HYFCpLFxwouxd8AtGo 06SMd/VwHrMFHZQjKdEeCKpbEXwsyjqBK4xmyGoCne63hGR+OnncWgFZe8URxj3feaa2Qx 7fstpDzZd9IMPHKFz7ou0G8qc5eaRepG9Lz2NHuRrnsMVqzIE+rae+MSDQ5KiSgzTgQDvw XCb0lbzAeBiUkEx2FT4vFnwLLfbcVoP1EzKbqu+hN5vIzqSg66g0SC7yYsmY3T4N/uZ3dk zA5BQfj9lbfrDVUEvyBYAHtwEMfr2veffmW1UYP74tnJYnyQLzwWX99jddQLag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658001014; a=rsa-sha256; cv=none; b=FTA+1MyN22URhCTm86gdW1DO22DZYIbrlZ6z2HBdzwM0TeWUXg2ZthMWdRrRLC6QD9qMDb /pn5qvuYO4eCNydVRbYzZ7WoudfDSkl5o0Ue9sp+fRq868ECUTwII+wtfz3DOy6AbT5oxJ X07ofsP0uT1EIhLYaKMGI1Wpf2Ro18o3bKdMSIfa2MF3JkhVa2+m21Zt4ZkLyxfOWfqBdb 15rtZKMbX1NzYzebdm+NwBtgof24RfJrHckkRZX0Q00p0g5zdFmOZpOaVnCpCHbrAMyO/g MuacxRmKkL220GKmW7JfrkwlSRkgw3udfYII871MoseBLw4z1CHCjTDu5hqXuw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Bba6IFL3; 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: 6.76 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Bba6IFL3; 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: 4D2E138D6B X-Spam-Score: 6.76 X-Migadu-Scanner: scn0.migadu.com X-TUID: 7R6mB0YIwjoS * gnu/packages/llvm.scm (libcxxabi-9): New variable. (libcxxabi-6): Inherit from it. --- gnu/packages/llvm.scm | 66 +++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index ba48897c8b..77c3ab73e0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1685,20 +1685,17 @@ (define-public libcxx-6 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) (inputs (list llvm-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 @@ -1709,8 +1706,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) @@ -1744,10 +1739,10 @@ (define (delete* what lst) (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"))))) @@ -1755,10 +1750,15 @@ (define (delete* what lst) (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 (clang-for-target clang-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 (clang-for-target clang-9))) (home-page "https://libcxxabi.llvm.org") (synopsis "C++ standard library support") (description @@ -1766,6 +1766,36 @@ (define (delete* what lst) 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 (clang-for-target clang-6))))) + (define-public libcxx+libcxxabi-6 (package (inherit libcxx-6) -- 2.37.0