From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 09 11:01:08 2022 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 To: guix-patches Subject: [PATCH]: gnu: libcxx: Update to 14.0.6. 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= 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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 23 06:37:31 2022 Received: (at 58394) by debbugs.gnu.org; 23 Oct 2022 10:37:31 +0000 Received: from localhost ([127.0.0.1]:43699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omYME-0004ve-LN for submit@debbugs.gnu.org; Sun, 23 Oct 2022 06:37:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omYMD-0004vR-30 for 58394@debbugs.gnu.org; Sun, 23 Oct 2022 06:37:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omYM4-00055o-Qs; Sun, 23 Oct 2022 06:37:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=wICVCvH2J6EhBhpoY0LQbYDJLru0ox4st7kmwAOyCQE=; b=pAIsMrGW+Riu3hthOu8a PhAUQR80LBCnx5EMYXbMgBMQgT7Uwusv1aaJHyNQA7rRvScVhCa7+oivgXrr5yD36Fo66QTuwIEV/ XFQmuozgMgOf3Of2aqqOCi0U7Y3HOWExzv7WkzHrcbfWKn6yojaBGYDVBKC0TgQUAb+yVTqKDs19Z 4pLSf9pHdl6Y4rtOdiWO9RsIEieYVYinLEYtx4r0Iy94DKpv02dhrwyrcRdpu6z6lvVefA412hKtn iuE02Bkk5qTaMNrIztDSObsGJYTpWYesRqTcVfbdrcvCjU0SRRZqmt3mirR4U9lAtYqYQ4fxJOj9t DP9LW+ZBvVD43w==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omYM2-00037f-VP; Sun, 23 Oct 2022 06:37:20 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Zhu Zihao Subject: Re: bug#58394: [PATCH]: gnu: libcxx: Update to 14.0.6. References: <86k059yrcm.fsf@163.com> Date: Sun, 23 Oct 2022 12:37:16 +0200 In-Reply-To: <86k059yrcm.fsf@163.com> (Zhu Zihao's message of "Sun, 09 Oct 2022 22:59:58 +0800") Message-ID: <87eduy4yhv.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 58394 Cc: 58394@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Hi, Zhu Zihao skribis: >>>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. [...] >>>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. I tried it and noticed a first issue: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index ad0cb088be..a6b6a3ce8f 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1584,6 +1584,7 @@ (define-public libcxx-6 (source (origin (inherit (package-source libcxx)) + (method url-fetch) (uri (llvm-uri "libcxx" version)) (sha256 (base32 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Then I tried to test with: ./pre-inst-env guix build libcxx@6 libcxxabi@6 libcxx irods-client-icomma= nds and hit the following failure (patches don=E2=80=99t apply): --8<---------------cut here---------------start------------->8--- @ build-started /gnu/store/hxdgg65dx1xwgggg80kdj7iq9akv55k4-llvm-project-14= .0.6-checkout.drv - x86_64-linux /var/log/guix/drvs/hx//dgg65dx1xwgggg80kdj= 7iq9akv55k4-llvm-project-14.0.6-checkout.drv.gz 18728 [=E2=80=A6] source is at 'llvm-project-14.0.6-checkout' applying '/gnu/store/kpcav1kq3h7rbp1fx5y1ng60zkgh4cv7-clang-14.0-libc-searc= h-path.patch'... Backtrace: 5 (primitive-load "/gnu/store/xyq3zyx8d952avv29d18s3dgxni=E2=80= =A6") In ice-9/eval.scm: 619:8 4 (_ #(#(# "llv=E2=80=A6") = #)) In ice-9/boot-9.scm: 142:2 3 (dynamic-wind # =E2=80=A6) In ice-9/eval.scm: 619:8 2 (_ #(#(#))) In srfi/srfi-1.scm: 634:9 1 (for-each # ("/gnu/store/kp=E2=80= =A6")) In guix/build/utils.scm: 762:6 0 (invoke "/gnu/store/z39hnrwds1dgcbpfgj8dnv2cngjb2xbl-p=E2=80= =A6" =E2=80=A6) guix/build/utils.scm:762:6: In procedure invoke: ERROR: 1. &invoke-error: program: "/gnu/store/z39hnrwds1dgcbpfgj8dnv2cngjb2xbl-patch-2.7.6/bin= /patch" arguments: ("--force" "--no-backup-if-mismatch" "-p1" "--input" "/gnu= /store/kpcav1kq3h7rbp1fx5y1ng60zkgh4cv7-clang-14.0-libc-search-path.patch") exit-status: 1 term-signal: #f stop-signal: #f builder for `/gnu/store/hxdgg65dx1xwgggg80kdj7iq9akv55k4-llvm-project-14.0.= 6-checkout.drv' failed with exit code 1 @ build-failed /gnu/store/hxdgg65dx1xwgggg80kdj7iq9akv55k4-llvm-project-14.= 0.6-checkout.drv - 1 builder for `/gnu/store/hxdgg65dx1xwgggg80kdj7iq9akv55= k4-llvm-project-14.0.6-checkout.drv' failed with exit code 1 --8<---------------cut here---------------end--------------->8--- Could you take a look? Also please use =E2=80=98git send-email=E2=80=99 to send the patches; that = will allow https://qa.guix.gnu.org to pick=E2=80=99em up! Thanks, Ludo=E2=80=99. --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 27 04:34:36 2022 Received: (at 58394) by debbugs.gnu.org; 27 Oct 2022 08:34:37 +0000 Received: from localhost ([127.0.0.1]:56117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyLL-0001KW-Mm for submit@debbugs.gnu.org; Thu, 27 Oct 2022 04:34:36 -0400 Received: from mail-m972.mail.163.com ([123.126.97.2]:42153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyLH-0001Jr-7U for 58394@debbugs.gnu.org; Thu, 27 Oct 2022 04:34:25 -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=OGtTj imhw4qYyObLU5V2QU5TKMgCFOBUjOg63qAzldE=; b=cS2VQen/qWw8bOKPxmUHv 7aFV4fTMsZMmcNrxSEcutGbpl5r8FZHtr9K4rQDDAWowrMg0sSjxRMKo24CW+mNw yVD9M7fIoqzoF6OuNuneif6MPQ2z01JbpNm5UpkuvsQiZeeOvx837AkXz5pLOqQF EDPmWVYMaOmeIQA6sEc474= Received: from localhost.localdomain (unknown [27.38.249.197]) by smtp2 (Coremail) with SMTP id GtxpCgDHxcOEQlpjQY5hpA--.34500S2; Thu, 27 Oct 2022 16:34:13 +0800 (CST) From: Zhu Zihao To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Subject: [PATCH 1/4] gnu: libcxx: Use G-expressions. Date: Thu, 27 Oct 2022 16:33:27 +0800 Message-Id: <20221027083330.960-1-all_but_last@163.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <87eduy4yhv.fsf@gnu.org> References: <87eduy4yhv.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CM-TRANSID: GtxpCgDHxcOEQlpjQY5hpA--.34500S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxGry7Jw17AFWDXFyDtFy7Jrb_yoW5Gr4UpF Z3Zw1F9r95Ca47Wws3Xr42kr9Yqa9avrs7Z3yaya1xJ3yj9Fy8trsrKFWfCrnrWr4vy3yr uw47tF4fu34rG3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUh18kUUUUU= X-Originating-IP: [27.38.249.197] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFB6nr1aEAZ4x0wABss X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 58394 Cc: 58394@debbugs.gnu.org, Zhu Zihao X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 © 2022 Greg Hogan ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Clément Lassieur +;;; Copyright © 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_INCLUDE_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 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 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)))) -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 27 04:34:37 2022 Received: (at 58394) by debbugs.gnu.org; 27 Oct 2022 08:34:37 +0000 Received: from localhost ([127.0.0.1]:56119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyLU-0001Ki-UJ for submit@debbugs.gnu.org; Thu, 27 Oct 2022 04:34:37 -0400 Received: from mail-m972.mail.163.com ([123.126.97.2]:42155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyLH-0001Js-AH for 58394@debbugs.gnu.org; Thu, 27 Oct 2022 04:34:25 -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=4RrtA 63+Ofp/J8UswgdeNXVvjfB7xxTgodtNFEHbADw=; b=PdbqlOnPZos/4tiLSGIN2 AUk0gv+Fu4Q9BZFm7BbTCmjXY8PIUP4dK5AUFo5vtuinHyoDJa5KSNdMF7swkDEM pGLvsZXnsxKsD/o0VZxtt0N6Aj4cT7CsSKnBgDbE2SlrLA30S69UpGLKZBpmVUQX YonhBsI74dOBcjrSfZAN6U= Received: from localhost.localdomain (unknown [27.38.249.197]) by smtp2 (Coremail) with SMTP id GtxpCgDHxcOEQlpjQY5hpA--.34500S5; Thu, 27 Oct 2022 16:34:14 +0800 (CST) From: Zhu Zihao To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Subject: [PATCH 4/4] gnu: libcxx+libcxxabi: Use G-expressions. Date: Thu, 27 Oct 2022 16:33:30 +0800 Message-Id: <20221027083330.960-4-all_but_last@163.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <87eduy4yhv.fsf@gnu.org> References: <87eduy4yhv.fsf@gnu.org> <20221027083330.960-1-all_but_last@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: GtxpCgDHxcOEQlpjQY5hpA--.34500S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cr15AF4DZF15KF1UJw1xuFg_yoW8tw43pF 9ayw1rWr95Ca47Wan3XF42kryrJws2vrs3ZrW2qr10kw4UZFy8XrZrKrWxCrn7ua1vyw4r uws5GFWF9w1UGFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0p_6wCtUUUUU= X-Originating-IP: [27.38.249.197] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFB6nr1aEAZ4x0wAGsr X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 58394 Cc: 58394@debbugs.gnu.org, Zhu Zihao X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (libcxx+libcxxabi-6)[arguments]: Use G-expressions. <#:configure-flags>: Use "this-package-native-input". --- gnu/packages/llvm.scm | 44 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 17c51ea6bb..324149116b 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1677,27 +1677,29 @@ (define-public libcxx+libcxxabi-6 (name "libcxx+libcxxabi") (version (package-version libcxx-6)) (arguments - `(#:configure-flags - (list "-DLIBCXX_CXX_ABI=libcxxabi" - (string-append "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=" - (assoc-ref %build-inputs "libcxxabi") - "/include")) - #: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_INCLUDE_PATH") - #\:)) - ":")) - (format #true - "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" - (getenv "CPLUS_INCLUDE_PATH")))))))) + (list + #:configure-flags + #~(list "-DLIBCXX_CXX_ABI=libcxxabi" + (string-append "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=" + #$(this-package-native-input "libcxxabi") + "/include")) + #: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_INCLUDE_PATH") + #\:)) + ":")) + (format + #true + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")))))))) (native-inputs (list clang-6 llvm-6 libcxxabi-6)))) -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 27 04:34:38 2022 Received: (at 58394) by debbugs.gnu.org; 27 Oct 2022 08:34:38 +0000 Received: from localhost ([127.0.0.1]:56121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyLV-0001Kq-F7 for submit@debbugs.gnu.org; Thu, 27 Oct 2022 04:34:38 -0400 Received: from mail-m972.mail.163.com ([123.126.97.2]:42161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyLH-0001Jt-5K for 58394@debbugs.gnu.org; Thu, 27 Oct 2022 04:34:25 -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=YAWId sMqz0DkNpIiofTUXB4Y0PzydNWy7ZGeYMjNchc=; b=XOC/CGhLWeLVfzJG1kLkr IjA1XqqH9g7MYzJWZNE9MH183bYBh6nQG52KL990re6kOiLBHuz0tFQBPOxoIjzZ MCewdddaHcy4VatvoWF9TYQxRaweaQGa4hT511C8rwCQcPlur45BXcEpfDUNNpJd SspUBD45UCV3BXyTRHnBU8= Received: from localhost.localdomain (unknown [27.38.249.197]) by smtp2 (Coremail) with SMTP id GtxpCgDHxcOEQlpjQY5hpA--.34500S4; Thu, 27 Oct 2022 16:34:13 +0800 (CST) From: Zhu Zihao To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Subject: [PATCH 3/4] gnu: libcxxabi: Use G-expressions. Date: Thu, 27 Oct 2022 16:33:29 +0800 Message-Id: <20221027083330.960-3-all_but_last@163.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <87eduy4yhv.fsf@gnu.org> References: <87eduy4yhv.fsf@gnu.org> <20221027083330.960-1-all_but_last@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: GtxpCgDHxcOEQlpjQY5hpA--.34500S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxZr1rCw43WryUZFyrZF1kXwb_yoW5uFWxpF sayr1rKrW5Cry3Ww4fXF47tryrJ392vrsrZrW2q34xA3yUAFy8trsxKrWfuFyxWw4vyw15 Wr48GFyruw1UWaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUU3ktUUUUU= X-Originating-IP: [27.38.249.197] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFB6nr1aEAZ4x0wAFso X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 58394 Cc: 58394@debbugs.gnu.org, Zhu Zihao X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/llvm.scm (libcxxabi-6)[arguments]: Use G-expressions. <#:configure-flags>: Use "this-package-native-input". --- gnu/packages/llvm.scm | 69 +++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 405ff0b0d8..17c51ea6bb 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1625,38 +1625,43 @@ (define-public libcxxabi-6 "0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "-DLIBCXXABI_LIBCXX_INCLUDES=" - (assoc-ref %build-inputs "libcxx") - "/include") - "-DCMAKE_C_COMPILER=clang" - "-DCMAKE_CXX_COMPILER=clang++") - #:phases - (modify-phases (@ (guix build cmake-build-system) %standard-phases) - (add-after 'unpack 'chdir - (lambda _ (chdir "libcxxabi"))) - (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 - (cons (string-append - (assoc-ref inputs "libcxx") "/include/c++/v1") - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH") - #\:))) - ":")) - (format #true - "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" - (getenv "CPLUS_INCLUDE_PATH"))))) - (add-after 'install '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))))))) + (list + #:configure-flags + #~(list (string-append "-DLIBCXXABI_LIBCXX_INCLUDES=" + #$(this-package-native-input "libcxx") + "/include") + "-DCMAKE_C_COMPILER=clang" + "-DCMAKE_CXX_COMPILER=clang++") + #:phases + #~(modify-phases (@ (guix build cmake-build-system) %standard-phases) + (add-after 'unpack 'chdir + (lambda _ (chdir "libcxxabi"))) + (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 + (cons (string-append + (assoc-ref inputs "libcxx") "/include/c++/v1") + (delete (string-append gcc "/include/c++") + (string-split + (getenv "CPLUS_INCLUDE_PATH") + #\:))) + ":")) + (format + #true + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH"))))) + (add-after 'install '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))))))) (native-inputs (list clang-6 llvm-6 libcxx-6)) (home-page "https://libcxxabi.llvm.org") -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 27 04:34:38 2022 Received: (at 58394) by debbugs.gnu.org; 27 Oct 2022 08:34:39 +0000 Received: from localhost ([127.0.0.1]:56123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyLW-0001Kx-DE for submit@debbugs.gnu.org; Thu, 27 Oct 2022 04:34:38 -0400 Received: from mail-m972.mail.163.com ([123.126.97.2]:42137) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyLH-0001Jq-5s for 58394@debbugs.gnu.org; Thu, 27 Oct 2022 04:34:26 -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=DBDOA NZoznce+lFQEPzSgi8BF/66G6ce4lq7DtEsM34=; b=leTjRMvRBi4FERjNQV91G eN04OJFNCeiLmcxA4iZ2GAonroOw1ri/c99u394BiYIidkfgHWQjSBH8USGmcRUa dqfWGF7yhjakzo1QFp6K3sh7eyV9+wjyY0R2pu8p6x2GvmcDEr8a4VvapxZp7jGQ dH9mmYfbiPnndhGc8/g6qU= Received: from localhost.localdomain (unknown [27.38.249.197]) by smtp2 (Coremail) with SMTP id GtxpCgDHxcOEQlpjQY5hpA--.34500S3; Thu, 27 Oct 2022 16:34:13 +0800 (CST) From: Zhu Zihao To: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Subject: [PATCH 2/4] gnu: libcxx: Update to 14.0.6. Date: Thu, 27 Oct 2022 16:33:28 +0800 Message-Id: <20221027083330.960-2-all_but_last@163.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <87eduy4yhv.fsf@gnu.org> References: <87eduy4yhv.fsf@gnu.org> <20221027083330.960-1-all_but_last@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: GtxpCgDHxcOEQlpjQY5hpA--.34500S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxXFWxuFy5Jr1Dur1Utw17Awb_yoWrXFW3pF WfWF4Fgr9YkryfGan3uF4xur1FqFWfAFn7X3yfA3WxKa1jyr18trWxKFWfKFnrXr4vyw4x uw4xJrWrXry5JFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JU238bUUUUU= X-Originating-IP: [27.38.249.197] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFB6nr1aEAZ4x0wADsu X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 58394 Cc: 58394@debbugs.gnu.org, Zhu Zihao X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 | 81 +++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 00918bfb90..405ff0b0d8 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1531,15 +1531,63 @@ (define-public lldb (define-public libcxx (package (name "libcxx") - (version "9.0.1") + (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"))) + ;; 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 llvm python)) + (home-page "https://libcxx.llvm.org") + (synopsis "C++ standard library") + (description + "This package provides an implementation of the C++ standard library for +use with Clang, targeting C++11, C++14 and above.") + (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))) + (license license:expat))) + +;; Libcxx files specifically used by PySide2. +(define-public libcxx-6 + (package + (inherit libcxx) + (version (package-version llvm-6)) (source (origin (method url-fetch) (uri (llvm-uri "libcxx" version)) (sha256 (base32 - "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089")))) - (build-system cmake-build-system) + "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n")))) (arguments (list #:phases @@ -1558,33 +1606,6 @@ (define-public libcxx "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" (getenv "CPLUS_INCLUDE_PATH")) #t)))))) - (native-inputs - (list clang llvm)) - (home-page "https://libcxx.llvm.org") - (synopsis "C++ standard library") - (description - "This package provides an implementation of the C++ standard library for -use with Clang, targeting C++11, C++14 and above.") - (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))) - (license license:expat))) - -;; Libcxx files specifically used by PySide2. -(define-public libcxx-6 - (package - (inherit libcxx) - (version (package-version llvm-6)) - (source - (origin - (inherit (package-source libcxx)) - (uri (llvm-uri "libcxx" version)) - (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)))) -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 27 04:37:19 2022 Received: (at 58394) by debbugs.gnu.org; 27 Oct 2022 08:37:19 +0000 Received: from localhost ([127.0.0.1]:56131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyO7-0001PP-3y for submit@debbugs.gnu.org; Thu, 27 Oct 2022 04:37:19 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:19491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onyO1-0001P6-4l for 58394@debbugs.gnu.org; Thu, 27 Oct 2022 04:37:18 -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=SiqtY kFmAMovMXyFZ/qcfe4tkHejbXIIc+zwwf2Svp0=; b=A5ZGnaxDQM/4RDveG43jr R4pbk9wKA8FCipnxBgPJ5ujJ1b3/QLE0QMREQHAlDK2OPZX3XsYuqO5RongREgZN 5qFE6civYoQatf6kqicyudgqZBe7MdcB3IHHFwRnUC7pIt0d7RZfk1420heL52Fr B/rzQk57NPGhrhs1SjgtGg= Received: from asus-laptop (unknown [27.38.249.197]) by smtp1 (Coremail) with SMTP id GdxpCgD3_9cwQ1pju4kcoA--.31800S2; Thu, 27 Oct 2022 16:37:05 +0800 (CST) References: <86k059yrcm.fsf@163.com> <87eduy4yhv.fsf@gnu.org> User-agent: mu4e 1.8.9; emacs 29.0.50 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#58394: [PATCH]: gnu: libcxx: Update to 14.0.6. Date: Thu, 27 Oct 2022 16:36:09 +0800 In-reply-to: <87eduy4yhv.fsf@gnu.org> Message-ID: <86bkpxvf1n.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GdxpCgD3_9cwQ1pju4kcoA--.31800S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4R0eHqDUUUU X-Originating-IP: [27.38.249.197] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFB6nr1aEAZ4x0wAIsl X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 58394 Cc: 58394@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I sent the new patches, please check it :). Ludovic Court=C3=A8s writes: > Also please use =E2=80=98git send-email=E2=80=99 to send the patches; tha= t will allow > https://qa.guix.gnu.org to pick=E2=80=99em up! > > Thanks, > Ludo=E2=80=99. =2D-=20 Retrieve my PGP public key: gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQT4UAIrVkIEZilSHr2K2nJqP6LM8gUCY1pDFBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQitpyaj+izPKW5QD+L4TdYCZHh2u2Bov70pmhtXWKC2Dx hIFmDIouJiykQlkBAJPVaRxiQuLeMeJKy+LTAhWIo03KYU8Hz7rVTGRZ9dsP =J36a -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 02 09:52:46 2022 Received: (at 58394) by debbugs.gnu.org; 2 Nov 2022 13:52:46 +0000 Received: from localhost ([127.0.0.1]:45207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqEAf-00053w-Uv for submit@debbugs.gnu.org; Wed, 02 Nov 2022 09:52:46 -0400 Received: from mail-m972.mail.163.com ([123.126.97.2]:28413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqEAc-00053e-5o for 58394@debbugs.gnu.org; Wed, 02 Nov 2022 09:52:44 -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=d+09A 85LIKEsn0j3WxP8MBjxZx4j1SjkBz8k0cvpCho=; b=eH8uKxtMm8Bf4QI21qoXU Xk2DudnxvLv7ouEKbwefFoHpdBqSEsXxECgwY8W8f9i675I143eDoemANn6TnsUv 65kMtX1LEh8ZCNPzs2wOx1XpdluNY5r+s3dPDIBEG2+zBC/XBHYvxgTCI/J64pLy raUCQf3ywAwwB4QkQCyxRA= Received: from asus-laptop (unknown [27.38.249.197]) by smtp2 (Coremail) with SMTP id GtxpCgBXKQ0edmJjlhJpqQ--.4922S2; Wed, 02 Nov 2022 21:52:31 +0800 (CST) References: <86k059yrcm.fsf@163.com> <87eduy4yhv.fsf@gnu.org> <86bkpxvf1n.fsf@163.com> User-agent: mu4e 1.8.9; emacs 29.0.50 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#58394: [PATCH]: gnu: libcxx: Update to 14.0.6. Date: Wed, 02 Nov 2022 21:52:03 +0800 In-reply-to: <86bkpxvf1n.fsf@163.com> Message-ID: <864jvhea5u.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GtxpCgBXKQ0edmJjlhJpqQ--.4922S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4Ra2NtDUUUU X-Originating-IP: [27.38.249.197] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBoQStr2I0VgAeUAACsr X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 58394 Cc: 58394@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Any progress on this? Zhu Zihao writes: > [[PGP Signed Part:Undecided]] > > I sent the new patches, please check it :). > > Ludovic Court=C3=A8s writes: > >> Also please use =E2=80=98git send-email=E2=80=99 to send the patches; th= at will allow >> https://qa.guix.gnu.org to pick=E2=80=99em up! >> >> Thanks, >> Ludo=E2=80=99. =2D-=20 Retrieve my PGP public key: gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQT4UAIrVkIEZilSHr2K2nJqP6LM8gUCY2J2DRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQitpyaj+izPIqMAEA/jcIdN69gJMUlEGqml2t3xfwSMll SBQ+j+B6/FNKUl0A/2bbHMQdZBI2E3Qr7rtLhYvtQxkOWwWVRv3hSTE81jUG =iy6F -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 19:38:30 2022 Received: (at 58394-done) by debbugs.gnu.org; 5 Nov 2022 23:38:30 +0000 Received: from localhost ([127.0.0.1]:58326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orSk9-0001l8-UE for submit@debbugs.gnu.org; Sat, 05 Nov 2022 19:38:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orSk6-0001ku-Kl for 58394-done@debbugs.gnu.org; Sat, 05 Nov 2022 19:38:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orSjx-000081-91; Sat, 05 Nov 2022 19:38:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=p8CLi9BAJkbUzYoXJ0fR1+UqRSBEbbQTOD6RgILct5g=; b=TeOk08XoyIclsgbclXHB l2OTooecNA4SIoA1zhSjrDbJfsxBW/VZBhCtO5FOddpXPndBlO1yYDv1Uxl1M/fl8VtNbjoSR5Xxi wqzwi8umULHNqvgSP1umEgL2/SsMEsJsKC9x3BbyB+swerY8ioMK64D/8QzFLt+MZiJaITJkTg4xy rRK+B1KfJeFbM8iI/IjrVnC9UmrkKyyRSMM51lgcYoNcmTtTjBkewFtkfRqWQ7wk37xFnBH7jnDgB 5ZYPbSShKRddcJLUuOZtLsRELWPcohQTFbc5TgWJ2kaDCjDft5f8uMw3sRWf4ICaXOGGqkB2vkWYD Jv4srY5zW8dvnA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orSjt-00028p-SC; Sat, 05 Nov 2022 19:38:15 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Zhu Zihao Subject: Re: [PATCH 1/4] gnu: libcxx: Use G-expressions. References: <87eduy4yhv.fsf@gnu.org> <20221027083330.960-1-all_but_last@163.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Sextidi 16 Brumaire an 231 de la =?utf-8?Q?R=C3=A9vo?= =?utf-8?Q?lution=2C?= jour du Chervis X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 06 Nov 2022 00:38:11 +0100 In-Reply-To: <20221027083330.960-1-all_but_last@163.com> (Zhu Zihao's message of "Thu, 27 Oct 2022 16:33:27 +0800") Message-ID: <87v8ntgefw.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 58394-done Cc: 58394-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Finally applied, thanks! a60dc46c2b gnu: libcxx+libcxxabi: Use G-expressions. 1bb3a3ea4e gnu: libcxxabi: Use G-expressions. 8501932f36 gnu: libcxx: Update to 14.0.6. 86af794215 gnu: libcxx: Use G-expressions. Ludo=E2=80=99. From unknown Sat Aug 16 18:40:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 04 Dec 2022 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator