From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 1hhgHGUW02LDPAEAbAwnHQ (envelope-from ) for ; Sat, 16 Jul 2022 21:49:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gL+BG2UW02LHbQAA9RJhRA (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 1623529B99 for ; Sat, 16 Jul 2022 21:49:57 +0200 (CEST) Received: from localhost ([::1]:48130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCnnY-0005d3-9j for larch@yhetil.org; Sat, 16 Jul 2022 15:49:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCnmj-0004Vi-Be for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oCnmj-0004hm-3G 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 1oCnmi-0005J5-Vi for guix-patches@gnu.org; Sat, 16 Jul 2022 15:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54239] [PATCH v3 09/10] gnu: Add libcxx-12. 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.165800091020293 (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]:46164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnmA-0005H8-4k for submit@debbugs.gnu.org; Sat, 16 Jul 2022 15:48:30 -0400 Received: from lepiller.eu ([89.234.186.109]:44376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oCnm2-0005Fm-FP 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 6eae8e7b 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=FVdHfJ9MBhs3/qy1ujtx57Y5r EJiwutzazhCYAq/PHM=; b=FBpCgbLwNZ5Eo77ePvNcDwlXjrGQLzE699qvHUm8l 4buqZNsSs8sdxD52f53HUV4yNYcPjoONRnj7SnTKnQosfyo6+gK0xxm/RWf+fxN/ Hb4Sw2wtTLzPtI+Hm9XjROCPsYtFa9OWrP+RY84TKgWFQQ+ZU7f6WmzA7j7/uj69 /9hQWd+APgM94P3peIj3/qF5x6hODanTo7wQFTqf1g0ONFygqCxnirE0zD+bJsna lUBUtWiHwIJZ9huZ4mT/7rTxn0MHAgLV5t9hdFJPe4/Xgvjvud5nU/j3rrx5xb5i h79vi2+5JywDslD4Hd7H5GFhk445jGTx5eE9lqibuqqcg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 3885e5ed (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:06 +0200 Message-Id: <20220716194807.20378-9-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=1658000997; 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=kByWVCZpVbHTgHDxpEj8i/SKG//pS9s6x34jgEmNLgw=; b=tgx9C9XWdU2DMFyCLrpNstA+UUHG0+XUtadO33C7+vWew2E/K3qOnWomduHsMxa2p2dXjE EvIUuS9sSOWwJNNPT9ABXORv6MYpftN3hSYmIKB5MRNDwfB9m1C2yNJFvQE0A89SyS65qE ufoySkxseIGfGhfeBX9BJcTluBh9v172AKZ9luiYJG9g2WuTRKrv8if/WVCEy7RhabBAQq dCJ+SJ+AA10m8SY9WB2FBUAAAqnE4KfbrQgxijqPpQLqRXM4A/R2iBbXY2Wpg3Fl9OtS55 FoEnCJ/lCQ1KM5IjTH3n+WN+Fx7Ab4gTPnIHez7Z0PMWSvocJn2fgQ5Ubf8Zdg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658000997; a=rsa-sha256; cv=none; b=Hedr4RSvrarZHPX6QhKriZ2LXUWVBhh5iZEiJGXld0jynUZpCsA3GOwXi/U3PxgdVXNtEM ChoL5DCyU1Dre+VY8yrMAMwYg7aFrQ3iPQSrYGYvBSPeDp3o64d1GuCRnHk29Z3k5SD3t6 ViQuDl9bt06Ur2qSUXUT6iSp/PDyoeyzdXqVXO9OCF7dV1tlK5H8u4Ouj5ZWq9urUCssih sLv3TXlG33Pmnvso+g5tXwt+Trz6DvDqp6QPfW+ZSyRUXrzQGtLh6rVMcRW5xQgxUUUmVb awNbcMca1w3kbpM5cyoUN4JNEU9V5pK4ckIdJuXZgKhuF19ojdw7DDn8Uo8jpg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=FBpCgbLw; 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=FBpCgbLw; 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: 1623529B99 X-Spam-Score: 6.76 X-Migadu-Scanner: scn0.migadu.com X-TUID: z3eDG1Da6q3x * gnu/packages/llvm.scm (libcxx): Rename to... (libcxx-9): ...this. (libcxx-12): New variable. --- gnu/packages/llvm.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 77c3ab73e0..4f0b57a990 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1624,21 +1624,24 @@ (define-public lldb (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))) (license license:asl2.0))) ;with LLVM exceptions -(define-public libcxx +(define-public libcxx-12 (package (name "libcxx") - (version "9.0.1") + (version (package-version llvm-12)) (source (origin (method url-fetch) - (uri (llvm-uri "libcxx" version)) + (uri (llvm-uri "llvm-project" version)) (sha256 (base32 - "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) + "03ps7akvbkxxa4xzal49v7lw3bz41zmjsp6fa7cslxrns5fb570j")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases (@ (guix build cmake-build-system) %standard-phases) + (add-after 'unpack 'chdir + (lambda _ + (chdir "libcxx"))) (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((gcc (or (assoc-ref (or native-inputs inputs) "gcc"))) @@ -1662,7 +1665,8 @@ (define-public libcxx (format #t "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" (getenv "CPLUS_INCLUDE_PATH")))))))) - (inputs (list llvm-9)) + (inputs (list llvm-12)) + (native-inputs (list python)) (home-page "https://libcxx.llvm.org") (synopsis "C++ standard library") (description @@ -1671,14 +1675,32 @@ (define-public libcxx (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))) (license license:expat))) +(define-public libcxx-9 + (package + (inherit libcxx-12) + (version (package-version llvm-9)) + (source + (origin + (method url-fetch) + (uri (llvm-uri "libcxx" version)) + (sha256 + (base32 + "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) + (arguments + (substitute-keyword-arguments (package-arguments libcxx-12) + ((#:phases phases) + `(modify-phases ,phases + (delete 'chdir))))) + (inputs (list llvm-9)))) + ;; Libcxx files specifically used by PySide2. (define-public libcxx-6 (package - (inherit libcxx) + (inherit libcxx-9) (version (package-version llvm-6)) (source (origin - (inherit (package-source libcxx)) + (inherit (package-source libcxx-9)) (uri (llvm-uri "libcxx" version)) (sha256 (base32 @@ -1757,7 +1779,7 @@ (define (delete* what lst) (install-file ,(string-append "../libcxxabi-" version ".src/include/cxxabi.h") include-dir))))))) - (inputs (list llvm-9 libcxx)) + (inputs (list llvm-9 libcxx-9)) (native-inputs (list (clang-for-target clang-9))) (home-page "https://libcxxabi.llvm.org") (synopsis "C++ standard library support") -- 2.37.0