From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 CLYRK3biQmNjXgEAbAwnHQ (envelope-from ) for ; Sun, 09 Oct 2022 17:02:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id kHYKK3biQmOxawEAauVa8A (envelope-from ) for ; Sun, 09 Oct 2022 17:02: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 9F1862D231 for ; Sun, 9 Oct 2022 17:02:13 +0200 (CEST) Received: from localhost ([::1]:44672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohXoi-0006RW-LY for larch@yhetil.org; Sun, 09 Oct 2022 11:02:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohXoY-0006RN-UN for guix-patches@gnu.org; Sun, 09 Oct 2022 11:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohXoY-0004Hu-GH for guix-patches@gnu.org; Sun, 09 Oct 2022 11:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ohXoY-0001EK-3Y for guix-patches@gnu.org; Sun, 09 Oct 2022 11:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58394] [PATCH]: gnu: libcxx: Update to 14.0.6. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Oct 2022 15:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58394@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.16653276684666 (code B ref -1); Sun, 09 Oct 2022 15:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Oct 2022 15:01:08 +0000 Received: from localhost ([127.0.0.1]:44740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohXnf-0001DB-MZ for submit@debbugs.gnu.org; Sun, 09 Oct 2022 11:01:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:35352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohXnd-0001D3-J7 for submit@debbugs.gnu.org; Sun, 09 Oct 2022 11:01:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohXnd-0006Oi-E1 for guix-patches@gnu.org; Sun, 09 Oct 2022 11:01:05 -0400 Received: from mail-m974.mail.163.com ([123.126.97.4]:11379) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohXnW-00043t-2r for guix-patches@gnu.org; Sun, 09 Oct 2022 11:01:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=L35D0 nFDIsKTtWf/fmGN+qPBYwAE+SARNRalmO1LorY=; b=VEVN9rARUSpLwMyXK3VEW n0akUxPLliwCEg4N+1EsgHbxS30oSqGziigY1/S2uREU/dq8YXb9L+20D+o+AQIz 6oti2LUUOQvKH5yd83EG8KrJ/vFu40QWRV+VjJZOPbFpbwi2efllPtkm1HNiZkFt wbW30xQIl2mJ9MKi99Rvs0= Received: from asus-laptop (unknown [163.125.249.189]) by smtp4 (Coremail) with SMTP id HNxpCgC3qtoP4kJj+BSsjQ--.9078S2; Sun, 09 Oct 2022 23:00:43 +0800 (CST) User-agent: mu4e 1.8.9; emacs 29.0.50 From: Zhu Zihao Date: Sun, 09 Oct 2022 22:59:58 +0800 Message-ID: <86k059yrcm.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HNxpCgC3qtoP4kJj+BSsjQ--.9078S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUjZXrUUUUU X-Originating-IP: [163.125.249.189] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBoRuVr2I0VGJUfAAAsI Received-SPF: pass client-ip=123.126.97.4; envelope-from=all_but_last@163.com; helo=mail-m974.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665327734; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=L35D0nFDIsKTtWf/fmGN+qPBYwAE+SARNRalmO1LorY=; b=XPpfU65ja6y8pcMfXkZSi05B+JCUg+tGa/BDVydufCtfHiyFw09SsCDyGqsh31Gh0+o3YR xrIEGNYcUxy+q+qn18TL2KG84HNeigRSR41wSqGF+5lQ0fSbFiglI/Mi6VQ26DbsUFso3V BC7nit2GN9XJkbYYUEPPspWpZmNOgAh7X8L8uwR3AAbSmtulK4MR+/XBrZEfNhlSj/BS0+ LZUJgR9m5Hl5T76IzmkwGfdtnQIQmLsNp/n8bSaO9nwZmtzOmpIMPjWXvoAZbsvr4625vs METtwXkhfnVl2OYGTElGRVAF2oB9BjURBBPUg7QTQUifwIqljwd/LbrcmQn3Tw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665327734; a=rsa-sha256; cv=none; b=TVvimeYsTAnpZM67DmE0E50RKidwQ/nCOfFcwk2F7z+emZoLRq/gN7RKO9J1l+gnZLhmw4 Bb2Q3bxxLLoKxTL3j3SJoIvnhfX+OFelpkvuaO0M09mOEyT4PTKng+PPuytolcL/LmeAQO OyJzpnc/IZluUWINIsAdf7H5NylnaCov4eCU2uvJiUq1iQFhIjAefMhd2gt16dU0ROoT6b dNjR8kXmnA45qJVHyK3Fs9ffQwCCzaNArhNOgsEWRKv6sknVBnzET8VpVRgigc6D0Xd3CW TjtXN+0YskKJnYRrWcvGrMW2nqBlNPlYDeXWseUCqVOKWHTYyNbUELmVhQOQIQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=VEVN9rAR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (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: 3.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=VEVN9rAR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (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: 9F1862D231 X-Spam-Score: 3.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: PZKFmws4TesG --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQT4UAIrVkIEZilSHr2K2nJqP6LM8gUCY0LiCRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQitpyaj+izPIYZwD/Sg9cCxu6T2PjEoqcf9/uyZr0LoyT DZSQd1hML3b3/OcBAPMH0/cutwMJmt/12U5Bpnh3EAzDsWRer5bTJImib/cA =8cw9 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-libcxx-Use-G-expressions.patch Content-Transfer-Encoding: quoted-printable >From 41b6beb2ee5770f791984fb7411a69ba77544681 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 7 Oct 2022 11:14:26 +0800 Subject: [PATCH 1/2] gnu: libcxx: Use G-expressions. * gnu/packages/llvm.scm (libcxx)[arguments]: Use G-expressions. (libcxx-6)[arguments]: Use G-expressions. --- gnu/packages/llvm.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 49eb25db1f..00918bfb90 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -25,6 +25,7 @@ ;;; Copyright =C2=A9 2022 Greg Hogan ;;; Copyright =C2=A9 2022 John Kehayias ;;; Copyright =C2=A9 2022 Cl=C3=A9ment Lassieur +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -1540,22 +1541,23 @@ (define-public libcxx "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) (build-system cmake-build-system) (arguments - `(#:phases - (modify-phases (@ (guix build cmake-build-system) %standard-phases) - (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Hide GCC's C++ headers so that they do not interfere with - ;; the ones we are attempting to build. - (setenv "CPLUS_INCLUDE_PATH" - (string-join (delete (string-append gcc "/include/c= ++") - (string-split (getenv "CPLUS_I= NCLUDE_PATH") - #\:)) - ":")) - (format #t - "environment variable `CPLUS_INCLUDE_PATH' changed = to ~a~%" - (getenv "CPLUS_INCLUDE_PATH")) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Hide GCC's C++ headers so that they do not interfere wi= th + ;; the ones we are attempting to build. + (setenv "CPLUS_INCLUDE_PATH" + (string-join (delete (string-append gcc "/include/= c++") + (string-split (getenv "CPLUS_= INCLUDE_PATH") + #\:)) + ":")) + (format #t + "environment variable `CPLUS_INCLUDE_PATH' changed= to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")) + #t)))))) (native-inputs (list clang llvm)) (home-page "https://libcxx.llvm.org") @@ -1578,6 +1580,11 @@ (define-public libcxx-6 (sha256 (base32 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) + (arguments + (substitute-keyword-arguments (package-arguments libcxx) + ((#:phases p) + #~(modify-phases #$p + (delete 'enter-subdirectory))))) (native-inputs (list clang-6 llvm-6)))) =20 --=20 2.37.3 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-libcxx-Update-to-14.0.6.patch >From b70e093e1ce01de0f607d70911e1539462c17a40 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 8 Oct 2022 16:26:44 +0800 Subject: [PATCH 2/2] gnu: libcxx: Update to 14.0.6. * gnu/packages/llvm.scm(libcxx)[source]: Use "llvm-monorepo". [arguments]<#:configure-flags>: Use clang & clang++, skip RPATH_CHANGE in CMake. <#:phases>: Add phase "enter-subdirectory". [native-inputs]: Add Python 3 for lit. (libcxx-6)[arguments]: Don't inherit from libcxx. --- gnu/packages/llvm.scm | 47 +++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 00918bfb90..ad0cb088be 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1531,19 +1531,27 @@ (define-public lldb (define-public libcxx (package (name "libcxx") - (version "9.0.1") - (source - (origin - (method url-fetch) - (uri (llvm-uri "libcxx" version)) - (sha256 - (base32 - "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) + (version "14.0.6") + (source (llvm-monorepo version)) (build-system cmake-build-system) (arguments (list + #:tests? #f + #:configure-flags + #~(list "-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi" + "-DCMAKE_C_COMPILER=clang" + "-DCMAKE_CXX_COMPILER=clang++" + ;; libc++.so is actually a GNU ld style linker script, however, + ;; CMake still tries to fix the RUNPATH of it during the install + ;; step. This argument tells CMake to use the install directory + ;; as RUNPATH and don't attempt to patch it. + ;; See also: https://gitlab.kitware.com/cmake/cmake/-/issues/22963 + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ + (chdir "runtimes"))) (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys) (let ((gcc (assoc-ref inputs "gcc"))) @@ -1559,7 +1567,7 @@ (define-public libcxx (getenv "CPLUS_INCLUDE_PATH")) #t)))))) (native-inputs - (list clang llvm)) + (list clang llvm python)) (home-page "https://libcxx.llvm.org") (synopsis "C++ standard library") (description @@ -1581,10 +1589,23 @@ (define-public libcxx-6 (base32 "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) (arguments - (substitute-keyword-arguments (package-arguments libcxx) - ((#:phases p) - #~(modify-phases #$p - (delete 'enter-subdirectory))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Hide GCC's C++ headers so that they do not interfere with + ;; the ones we are attempting to build. + (setenv "CPLUS_INCLUDE_PATH" + (string-join (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":")) + (format #t + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")) + #t)))))) (native-inputs (list clang-6 llvm-6)))) -- 2.37.3 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC Zihao --=-=-=--