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