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))))