From patchwork Sun Oct 23 10:37:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 44029 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A528627BBEA; Mon, 24 Oct 2022 06:09:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E089C27BBE9 for ; Mon, 24 Oct 2022 06:09:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ommAZ-0004Xh-AH for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 21:22:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omYMk-0006UG-C1 for guix-patches@gnu.org; Sun, 23 Oct 2022 06:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1omYMk-00059W-4b for guix-patches@gnu.org; Sun, 23 Oct 2022 06:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omYMj-0004ws-Tl for guix-patches@gnu.org; Sun, 23 Oct 2022 06:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58394] [PATCH]: gnu: libcxx: Update to 14.0.6. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Oct 2022 10:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zhu Zihao Cc: 58394@debbugs.gnu.org Received: via spool by 58394-submit@debbugs.gnu.org id=B58394.166652145118954 (code B ref 58394); Sun, 23 Oct 2022 10:38:01 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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: Then I tried to test with: ./pre-inst-env guix build libcxx@6 libcxxabi@6 libcxx irods-client-icommands and hit the following failure (patches don’t 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//dgg65dx1xwgggg80kdj7iq9akv55k4-llvm-project-14.0.6-checkout.drv.gz 18728 […] source is at 'llvm-project-14.0.6-checkout' applying '/gnu/store/kpcav1kq3h7rbp1fx5y1ng60zkgh4cv7-clang-14.0-libc-search-path.patch'... Backtrace: 5 (primitive-load "/gnu/store/xyq3zyx8d952avv29d18s3dgxni…") In ice-9/eval.scm: 619:8 4 (_ #(#(# "llv…") #)) In ice-9/boot-9.scm: 142:2 3 (dynamic-wind # …) In ice-9/eval.scm: 619:8 2 (_ #(#(#))) In srfi/srfi-1.scm: 634:9 1 (for-each # ("/gnu/store/kp…")) In guix/build/utils.scm: 762:6 0 (invoke "/gnu/store/z39hnrwds1dgcbpfgj8dnv2cngjb2xbl-p…" …) 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/hxdgg65dx1xwgggg80kdj7iq9akv55k4-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 ‘git send-email’ to send the patches; that will allow https://qa.guix.gnu.org to pick’em up! Thanks, Ludo’. 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 From patchwork Thu Oct 27 08:33:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 44151 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9282727BBF0; Thu, 27 Oct 2022 09:35:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B777327BBE9 for ; Thu, 27 Oct 2022 09:35:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onyMB-0004cf-GT; Thu, 27 Oct 2022 04:35:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onyLw-0003rg-MB for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onyLw-0006t7-8D for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1onyLv-0001M9-VI for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58394] [PATCH 2/4] gnu: libcxx: Update to 14.0.6. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Oct 2022 08:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 58394@debbugs.gnu.org, Zhu Zihao Received: via spool by 58394-submit@debbugs.gnu.org id=B58394.16668596795153 (code B ref 58394); Thu, 27 Oct 2022 08:35:03 +0000 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 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 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-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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)))) From patchwork Thu Oct 27 08:33:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 44152 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 18E2F27BBEB; Thu, 27 Oct 2022 09:35:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C748B27BBEE for ; Thu, 27 Oct 2022 09:35:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onyMA-0004NZ-C2; Thu, 27 Oct 2022 04:35:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onyLw-0003ps-0g for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onyLv-0006qQ-Mg for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1onyLv-0001M2-IM for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58394] [PATCH 3/4] gnu: libcxxabi: Use G-expressions. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Oct 2022 08:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 58394@debbugs.gnu.org, Zhu Zihao Received: via spool by 58394-submit@debbugs.gnu.org id=B58394.16668596785146 (code B ref 58394); Thu, 27 Oct 2022 08:35:03 +0000 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 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 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-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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Oct 27 08:33:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 44153 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DC5C027BBE9; Thu, 27 Oct 2022 09:36:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA05427BBEA for ; Thu, 27 Oct 2022 09:36:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onyMA-0004YB-UO; Thu, 27 Oct 2022 04:35:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onyLv-0003ig-HT for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onyLv-0006ll-66 for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1onyLv-0001Ls-13 for guix-patches@gnu.org; Thu, 27 Oct 2022 04:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58394] [PATCH 4/4] gnu: libcxx+libcxxabi: Use G-expressions. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Oct 2022 08:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 58394@debbugs.gnu.org, Zhu Zihao Received: via spool by 58394-submit@debbugs.gnu.org id=B58394.16668596775139 (code B ref 58394); Thu, 27 Oct 2022 08:35:02 +0000 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 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 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-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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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))))