From patchwork Mon Oct 23 12:36:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 55157 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 7925D27BBEA; Mon, 23 Oct 2023 13:39:13 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 5ECD427BBE2 for ; Mon, 23 Oct 2023 13:39:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuCp-0003IB-4H; Mon, 23 Oct 2023 08:38:51 -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 1quuCY-0003DU-CX for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:35 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quuCX-0001Ma-TE for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuD0-0007UC-R0; Mon, 23 Oct 2023 08:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 02/14] gnu: clang-runtime-from-llvm: Add phase for LLVM monorepo. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806472528716 (code B ref 66701); Mon, 23 Oct 2023 12:39:02 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:38:45 +0000 Received: from localhost ([127.0.0.1]:49340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCi-0007T6-Q3 for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:45 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:56740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCe-0007Se-6g for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698064537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iDXFO6C+8HbHQC+Eb8G91B8EhouBzJsSvEfprfzsexk=; b=QrDVDItacSxILmz1LsmGVn2Yk9yX5rLMbBGrDgqOg5eXNkOTfMLHXiUA6Ix+tO3SRfx79L ofdFttF0cydsIXdh7I6RDj4KdFtQK/OF6wtxPEtzd4ZA6W+KC95p0TrakFBxH9oetwDOa8 xPjM0Bz+R3LZt5uYssSEu2fvIssnFf2IRNTAqcsFyRSzU1LGdDzXCxmk9byy6+ij0qZbA5 L4udfzMfoF4zFfokcPziC8WY6iGbsPnU6hT2EKKe78nwsfufZQWnGZbtnsEisZI8ydp9q4 jMJBtH1gr5TpoSPLBNEMuievEFf5SjG89/qqLEcCDRK646MFXVRFlNb87x2/7g== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 23 Oct 2023 20:36:10 +0800 Message-ID: <07785d53bcb056226595ed303d4669f43dba5970.1698063805.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (clang-runtime-from-llvm)[arguments]<#:phases>: Change directory to "compiler-rt" for LLVM monorepo. (clang-runtime-15,clang-runtime-14): Adjust accordingly. Change-Id: I6a77c9d106439e4794b8531e2160e2c9ce63d86e --- gnu/packages/llvm.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 38c4047f48..97902fcf5c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -161,6 +161,11 @@ (define* (clang-runtime-from-llvm llvm (ice-9 match) ,@%cmake-build-system-modules) #:phases (modify-phases (@ (guix build cmake-build-system) %standard-phases) + ,@(if hash + '() + '((add-after 'unpack 'change-directory + (lambda _ + (chdir "compiler-rt"))))) (add-after 'set-paths 'hide-glibc ;; Work around https://issues.guix.info/issue/36882. We need to ;; remove glibc from CPLUS_INCLUDE_PATH so that the one hardcoded @@ -714,28 +719,10 @@ (define-public llvm-14 ("perl" ,perl))))) (define-public clang-runtime-15 - (let ((template (clang-runtime-from-llvm llvm-15))) - (package - (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) - #~(modify-phases #$phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "compiler-rt")))))))))) + (clang-runtime-from-llvm llvm-15)) (define-public clang-runtime-14 - (let ((template (clang-runtime-from-llvm llvm-14))) - (package - (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) - #~(modify-phases #$phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "compiler-rt")))))))))) + (clang-runtime-from-llvm llvm-14)) (define-public clang-15 (clang-from-llvm