From unknown Sat Aug 09 01:07:02 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#61879 <61879@debbugs.gnu.org> To: bug#61879 <61879@debbugs.gnu.org> Subject: Status: [core-updates] libstdc++ fails to build on powerpc64le-linux Reply-To: bug#61879 <61879@debbugs.gnu.org> Date: Sat, 09 Aug 2025 08:07:02 +0000 retitle 61879 [core-updates] libstdc++ fails to build on powerpc64le-linux reassign 61879 guix submitter 61879 Ludovic Court=C3=A8s severity 61879 important thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 28 18:17:01 2023 Received: (at submit) by debbugs.gnu.org; 28 Feb 2023 23:17:02 +0000 Received: from localhost ([127.0.0.1]:52170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pX9DR-0007c7-7n for submit@debbugs.gnu.org; Tue, 28 Feb 2023 18:17:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:38206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pX9DN-0007bn-ET for submit@debbugs.gnu.org; Tue, 28 Feb 2023 18:16:59 -0500 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 1pX9DN-0006cY-3u for bug-guix@gnu.org; Tue, 28 Feb 2023 18:16:57 -0500 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 1pX9DM-0006Rs-R3 for bug-guix@gnu.org; Tue, 28 Feb 2023 18:16:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=TIbrFPMxDP5jHuVdry3I5uDX0M22uKPt6jzKnqBXSWc=; b=QCGuAzQt62eB7+ yg9GaygUdTM3rg8d14k5+Jj21jVbRC7FE8Ic/pY7/XhGutyUkSWVjuPuPuXwiTQBdWdf25pNs4jaA wuUuYkIZsKM5ZItNLRkMm0hNb7rb4O7yy2l2VoOf61CHDqtvh7jULeO32KivSil2YTsh+Ravbi9GD aNJFpiU46LfM7MPyS1K+fXesLw8TjH1AmfliZUD5uEZ/Ifj/SIKIUDP1MbXr6Wxnv7bUf8C+vnO57 UGRrmEQIPAEjLxf+ZA8/79LCIsuNXdd9Wihmk0b11bRSUf6rqvW1IwuBpUwIDXDvI6iJ6IoNnq98Y azu5H5hDBvm3aSlrSZIQ==; 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 1pX9DM-0005aM-EO for bug-guix@gnu.org; Tue, 28 Feb 2023 18:16:56 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: bug-guix@gnu.org Subject: [core-updates] libstdc++ fails to build on powerpc64le-linux X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Primidi 11 =?utf-8?Q?Vent=C3=B4se?= an 231 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du Narcisse 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: Wed, 01 Mar 2023 00:16:54 +0100 Message-ID: <87a60xcrdl.fsf@inria.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (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: 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: -3.3 (---) >From (commit 0825162a35362640b47d3cabe278fd7ea49140bd and later): --8<---------------cut here---------------start------------->8--- libtool: compile: g++ -I/tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3.0/= libstdc++-v3/../libgcc -I/tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3.0/= build/include/ -I/tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3.0/build/in= clude -I/tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3.0/libstdc++-v3/libs= upc++ -std=3Dgnu++17 -nostdinc++ -fno-implicit-templates -Wall -Wextra -Wwr= ite-strings -Wcast-qual -Wabi=3D2 -fdiagnostics-show-location=3Donce -ffunc= tion-sections -fdata-sections -frandom-seed=3Dfs_path.lo -mno-gnu-attribute= -fimplicit-templates -c ../../../libstdc++-v3/src/c++17/fs_path.cc ../../../libstdc++-v3/src/c++17/floating_from_chars.cc: In function 'std::f= rom_chars_result std::from_chars(const char*, const char*, __ieee128&, std:= :chars_format)': ../../../libstdc++-v3/src/c++17/floating_from_chars.cc:499:8: error: 'strin= g' is not a member of 'std::pmr'; did you mean 'std::string'? 499 | pmr::string buf(&mr); | ^~~~~~ In file included from /tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3.0/bui= ld/include/string:39, from ../../../libstdc++-v3/src/c++17/floating_from_chars.c= c:34: /tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3.0/build/include/bits/string= fwd.h:79:33: note: 'std::string' declared here 79 | typedef basic_string string; | ^~~~~~ ../../../libstdc++-v3/src/c++17/floating_from_chars.cc:504:55: error: 'buf'= was not declared in this scope 504 | if (const char* pat =3D pattern(first, last, fmt, buf)) [[lik= ely]] | ^~~ make[3]: *** [Makefile:762: floating_from_chars.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from ../../../libstdc++-v3/src/c++17/fs_ops.cc:58: ../../../libstdc++-v3/src/c++17/../filesystem/ops-common.h: In function 'st= d::filesystem::file_type std::filesystem::make_file_type(const stat_type&)': ../../../libstdc++-v3/src/c++17/../filesystem/ops-common.h:269:35: warning:= unused parameter 'st' [-Wunused-parameter] 269 | make_file_type(const stat_type& st) noexcept | ~~~~~~~~~~~~~~~~~^~ make[3]: Leaving directory '/tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3= .0/build/src/c++17' make[2]: *** [Makefile:765: all-recursive] Error 1 make[2]: Leaving directory '/tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3= .0/build/src' make[1]: *** [Makefile:568: all-recursive] Error 1 make[1]: Leaving directory '/tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3= .0/build' make: *** [Makefile:493: all] Error 2 error: in phase 'build': uncaught exception: srfi-34 #=20 phase `build' failed after 6.0 seconds command "make" "-j" "32" failed with status 2 builder for `/gnu/store/bpx8ar4qq4bkskhhj25l5phxxji0ljf8-libstdc++-11.3.0.d= rv' failed with exit code 1 @ build-failed /gnu/store/bpx8ar4qq4bkskhhj25l5phxxji0ljf8-libstdc++-11.3.0= .drv - 1 builder for `/gnu/store/bpx8ar4qq4bkskhhj25l5phxxji0ljf8-libstdc++= -11.3.0.drv' failed with exit code 1 --8<---------------cut here---------------end--------------->8--- Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 01 10:31:09 2023 Received: (at control) by debbugs.gnu.org; 1 Mar 2023 15:31:09 +0000 Received: from localhost ([127.0.0.1]:54636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXOQ8-0005pF-Rj for submit@debbugs.gnu.org; Wed, 01 Mar 2023 10:31:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXOQ8-0005oo-4V for control@debbugs.gnu.org; Wed, 01 Mar 2023 10:31:08 -0500 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 1pXOQ2-000378-Ot for control@debbugs.gnu.org; Wed, 01 Mar 2023 10:31:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=66P7XQn0uLL5f9xnU2m0atAubmNb3WAUO8Qrm0kp9ZY=; b=sWTJDCinnrE9IT Ny1H4vFAfE5N8vykwsFsBdOAO7/cW6uTvbQytQR01vB+Kn0sn8vzv0SBA1lfURNw/l7OPI+q7A4+F PObRHms3P9IHNATXKiLxbD8G1lZrUcs76yHXbiIhorjIk+YoTDpPUmNUjRDSgy6qZkbXooDdtkbYD N99nd1OVdVgPDxxwDCHhCwkuP82OLTIJgd82kcZ1pmI35sSWYLnsua4udZxdobEIB7SyKXRv+PURs NpvsYcbnK7yBqYNsX7yvgC9uoxdWkw17noiaq2w/f18YiEdVdmq1srxW7bTtdTlctzy5gnfxvU3yG 8eVwuIApo7Zyd67BDXkA==; 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 1pXOPx-0006Lk-3g for control@debbugs.gnu.org; Wed, 01 Mar 2023 10:31:00 -0500 Date: Wed, 01 Mar 2023 16:30:55 +0100 Message-Id: <875ybkcwuo.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #61879 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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 (---) severity 61879 important quit From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 13 05:32:32 2023 Received: (at 61879) by debbugs.gnu.org; 13 Apr 2023 09:32:32 +0000 Received: from localhost ([127.0.0.1]:42532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmtJg-00088H-3I for submit@debbugs.gnu.org; Thu, 13 Apr 2023 05:32:32 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:49926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmtJe-000883-Dj for 61879@debbugs.gnu.org; Thu, 13 Apr 2023 05:32:31 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 944CD1C70; Thu, 13 Apr 2023 11:32:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dy4LZN9Mq8Va; Thu, 13 Apr 2023 11:32:24 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D0E1CDF2; Thu, 13 Apr 2023 11:32:23 +0200 (CEST) Date: Thu, 13 Apr 2023 11:32:22 +0200 From: Andreas Enge To: guix-devel@gnu.org Subject: Powerpc on core-updates Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879 Cc: 61879@debbugs.gnu.org, Efraim Flashner 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 (-) Hello, recently I claimed that powerpc was repaired, but I must have made a mistake. It is still completely broken: https://ci.guix.gnu.org/eval/391720/dashboard?system=powerpc64le-linux due to this: https://issues.guix.gnu.org/61879 It does not look easy to fix, but might be *the* blocker for a core-updates merge... The error is this: ../../../libstdc++-v3/src/c++17/floating_from_chars.cc: In function 'std::from_chars_result std::from_chars(const char*, const char*, __ieee128&, std::chars_format)': ../../../libstdc++-v3/src/c++17/floating_from_chars.cc:499:8: error: 'string' is not a member of 'std::pmr'; did you mean 'std::string'? 499 | pmr::string buf(&mr); | ^~~~~~ In file included from /tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3.0/build/include/string:39, from ../../../libstdc++-v3/src/c++17/floating_from_chars.cc:34: /tmp/guix-build-libstdc++-11.3.0.drv-0/gcc-11.3.0/build/include/bits/stringfwd.h:79:33: note: 'std::string' declared here 79 | typedef basic_string string; | ^~~~~~ ../../../libstdc++-v3/src/c++17/floating_from_chars.cc:504:55: error: 'buf' was not declared in this scope 504 | if (const char* pat = pattern(first, last, fmt, buf)) [[likely]] In the file libstdc++-v3/src/c++17/floating_from_chars.cc previous functions have code like this: #if _GLIBCXX_USE_CXX11_ABI buffer_resource mr; pmr::string buf(&mr); #else string buf; if (!reserve_string(buf)) return make_result(first, 0, {}, ec); #endif while here we only have: buffer_resource mr; pmr::string buf(&mr); So my guess would be that we should simply replace this snippet with the one above. Could someone with access to a powerpc machine try out this change? Andreas From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 13 05:52:04 2023 Received: (at 61879) by debbugs.gnu.org; 13 Apr 2023 09:52:04 +0000 Received: from localhost ([127.0.0.1]:42551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmtcZ-0000I9-Iz for submit@debbugs.gnu.org; Thu, 13 Apr 2023 05:52:04 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:39202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmtcV-0000Hc-3B for 61879@debbugs.gnu.org; Thu, 13 Apr 2023 05:52:01 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A43F11C70; Thu, 13 Apr 2023 11:51:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rCVfwtUBf_CI; Thu, 13 Apr 2023 11:51:52 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id AF0521C6F; Thu, 13 Apr 2023 11:51:52 +0200 (CEST) Date: Thu, 13 Apr 2023 11:51:51 +0200 From: Andreas Enge To: guix-devel@gnu.org Subject: Re: Powerpc on core-updates Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="gVO+DanPEUbFQpuJ" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879 Cc: 61879@debbugs.gnu.org, Efraim Flashner 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 (-) --gVO+DanPEUbFQpuJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I may as well try to provide a patch. It is untested even on x86_64, since it requires quite a few rebuilds. If it works on powerpc, it should probably be made conditional on the architecture to avoid a world rebuild. I do not know whether this is possible in the patches field in an origin. Andreas --gVO+DanPEUbFQpuJ Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="0001-gnu-gcc-11-Fix-build-on-powerpc64le.patch" Content-Transfer-Encoding: 8bit >From 5eb50bdc34759d4c917f2143e037fad62bc08ed7 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 13 Apr 2023 11:46:47 +0200 Subject: [PATCH] gnu: gcc-11: Fix build on powerpc64le. * gnu/packages/patches/gcc-11-libstdc++-powerpc.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/gcc.scm (gcc-11)[origin]: Use patch. --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 5 +++-- .../patches/gcc-11-libstdc++-powerpc.patch | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/gcc-11-libstdc++-powerpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index b07811f1cb..1255846462 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1184,6 +1184,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \ + %D%/packages/patches/gcc-11-libstdc++-powerpc.patch \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a511cdbc45..631e08db25 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012-2023 Ludovic Courtčs ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus -;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2015, 2023 Andreas Enge ;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -703,7 +703,8 @@ (define-public gcc-11 "0fdclcwf728wbq52vphfcjywzhpsjp3kifzj3pib3xcihs0z4z5l")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch" - "gcc-10-tree-sra-union-handling.patch")) + "gcc-10-tree-sra-union-handling.patch" + "gcc-11-libstdc++-powerpc.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments diff --git a/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch b/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch new file mode 100644 index 0000000000..aff2ef16f1 --- /dev/null +++ b/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch @@ -0,0 +1,18 @@ +diff -u -r gcc-11.3.0.alt/libstdc++-v3/src/c++17/floating_from_chars.cc gcc-11.3.0/libstdc++-v3/src/c++17/floating_from_chars.cc +--- gcc-11.3.0.alt/libstdc++-v3/src/c++17/floating_from_chars.cc 2023-04-13 11:36:08.169841428 +0200 ++++ gcc-11.3.0/libstdc++-v3/src/c++17/floating_from_chars.cc 2023-04-13 11:36:54.825827304 +0200 +@@ -495,8 +495,14 @@ + from_chars(const char* first, const char* last, __ieee128& value, + chars_format fmt) noexcept + { ++#if _GLIBCXX_USE_CXX11_ABI + buffer_resource mr; + pmr::string buf(&mr); ++#else ++ string buf; ++ if (!reserve_string(buf)) ++ return make_result(first, 0, {}, ec); ++#endif + size_t len = 0; + errc ec = errc::invalid_argument; + __try -- 2.39.2 --gVO+DanPEUbFQpuJ-- From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 13 09:49:38 2023 Received: (at 61879) by debbugs.gnu.org; 13 Apr 2023 13:49:38 +0000 Received: from localhost ([127.0.0.1]:42882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmxKU-0001Vz-3j for submit@debbugs.gnu.org; Thu, 13 Apr 2023 09:49:38 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmxKR-0001Vn-GJ for 61879@debbugs.gnu.org; Thu, 13 Apr 2023 09:49:36 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id F15A2174FC; Thu, 13 Apr 2023 14:49:33 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 7895bd83; Thu, 13 Apr 2023 13:49:32 +0000 (UTC) References: <87a60xcrdl.fsf@inria.fr> User-agent: mu4e 1.8.13; emacs 28.2 From: Christopher Baines To: Andreas Enge Subject: Re: bug#61879: Powerpc on core-updates Date: Thu, 13 Apr 2023 14:46:00 +0100 In-reply-to: Message-ID: <87mt3byjrp.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879 Cc: guix-devel@gnu.org, 61879@debbugs.gnu.org, Efraim Flashner 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: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Andreas Enge writes: > In the file > libstdc++-v3/src/c++17/floating_from_chars.cc > previous functions have code like this: > #if _GLIBCXX_USE_CXX11_ABI > buffer_resource mr; > pmr::string buf(&mr); > #else > string buf; > if (!reserve_string(buf)) > return make_result(first, 0, {}, ec); > #endif > > while here we only have: > buffer_resource mr; > pmr::string buf(&mr); > > So my guess would be that we should simply replace this snippet with the > one above. > > Could someone with access to a powerpc machine try out this change? Thanks for figuring this out Andreas! I've managed to apply this change in the relevant place, and it appears to work. I tried to apply it in a way that only affected powerpc64le-linux, but I'm not sure I was successful. I've got no idea where it's best to apply this patch, or how describe it, but at least this is a step forward. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-WIP.patch Content-Transfer-Encoding: quoted-printable From=20382862fc06085ba80380977caf2a1f9c3203a12d Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 13 Apr 2023 14:45:14 +0100 Subject: [PATCH] WIP =2D-- gnu/packages/gcc.scm | 108 ++++++++++++++++++--------------- gnu/packages/patches/foo.patch | 20 ++++++ 2 files changed, 80 insertions(+), 48 deletions(-) create mode 100644 gnu/packages/patches/foo.patch diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a511cdbc45..6f6f2caa5e 100644 =2D-- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -853,56 +853,68 @@ (define-public (make-libstdc++ gcc) (inherit gcc) (name "libstdc++") (arguments =2D `(#:out-of-source? #t =2D #:modules ((srfi srfi-1) + (list + #:out-of-source? #t + #:modules `((srfi srfi-1) (srfi srfi-26) ,@%gnu-build-system-modules) =2D #:phases =2D (modify-phases %standard-phases =2D ,@(if (version>=3D? (package-version gcc) "11") =2D `((add-after 'unpack 'hide-gcc-headers =2D (lambda* (#:key native-inputs inputs #:allow-other-ke= ys) =2D (let ((gcc (assoc-ref (or native-inputs inputs) =2D ,(if (%current-target-system) =2D "cross-gcc" =2D "gcc")))) =2D ;; Fix a regression in GCC 11 where the GCC heade= rs =2D ;; shadows glibc headers when building libstdc++.= An =2D ;; upstream fix was added in GCC 11.3.0, but it o= nly =2D ;; hides system include directories, not those on =2D ;; CPLUS_INCLUDE_PATH. See discussion at =2D ;; =2D ;; and the similar adjustment in GCC-FINAL. =2D (substitute* "libstdc++-v3/src/c++17/Makefile.in" =2D (("AM_CXXFLAGS =3D ") =2D (string-append ,(if (%current-target-system) =2D "CROSS_CPLUS_INCLUDE_PATH = =3D " =2D "CPLUS_INCLUDE_PATH =3D ") =2D (string-join =2D (remove (cut string-prefix? gc= c <>) =2D (string-split =2D (getenv =2D ,(if (%current-targe= t-system) =2D "CROSS_CPLUS_IN= CLUDE_PATH" =2D "CPLUS_INCLUDE_= PATH")) =2D #\:)) =2D ":") =2D "\nAM_CXXFLAGS =3D "))))))) =2D '()) =2D ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib6= 4. =2D (add-before 'chdir 'fix-rs6000-libdir =2D (lambda _ =2D (when (file-exists? "gcc/config/rs6000") =2D (substitute* (find-files "gcc/config/rs6000") =2D (("/lib64") "/lib"))))) =2D (add-before 'configure 'chdir =2D (lambda _ =2D (chdir "libstdc++-v3")))) =2D =2D #:configure-flags `("--disable-libstdcxx-pch" =2D ,(string-append "--with-gxx-include-dir=3D" =2D (assoc-ref %outputs "out") =2D "/include")))) + #:phases + #~(modify-phases %standard-phases + #$@(if (and (target-ppc64le?) + (version>=3D? (package-version gcc) "11")) + #~((add-after 'unpack 'patch-foo + (lambda _ + (define patch + #$(local-file + (search-patch "foo.patch"))) + (peek "CWD" (getcwd)) + (invoke "patch" "--force" "-p1" "-i" patch)))) + '()) + #$@(if (version>=3D? (package-version gcc) "11") + #~((add-after 'unpack 'hide-gcc-headers + (lambda* (#:key native-inputs inputs #:allow-other-k= eys) + (let ((gcc (assoc-ref (or native-inputs inputs) + #$(if (%current-target-syste= m) + "cross-gcc" + "gcc")))) + ;; Fix a regression in GCC 11 where the GCC head= ers + ;; shadows glibc headers when building libstdc++= . An + ;; upstream fix was added in GCC 11.3.0, but it = only + ;; hides system include directories, not those on + ;; CPLUS_INCLUDE_PATH. See discussion at + ;; + ;; and the similar adjustment in GCC-FINAL. + (substitute* "libstdc++-v3/src/c++17/Makefile.in" + (("AM_CXXFLAGS =3D ") + (string-append #$(if (%current-target-system) + "CROSS_CPLUS_INCLUDE_PAT= H =3D " + "CPLUS_INCLUDE_PATH =3D = ") + (string-join + (remove (cut string-prefix? g= cc <>) + (string-split + (getenv + #$(if (%current-tar= get-system) + "CROSS_CPLUS_= INCLUDE_PATH" + "CPLUS_INCLUD= E_PATH")) + #\:)) + ":") + "\nAM_CXXFLAGS =3D "))))))) + '()) + ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64. + (add-before 'chdir 'fix-rs6000-libdir + (lambda _ + (when (file-exists? "gcc/config/rs6000") + (substitute* (find-files "gcc/config/rs6000") + (("/lib64") "/lib"))))) + (add-before 'configure 'chdir + (lambda _ + (chdir "libstdc++-v3")))) + + #:configure-flags #~(list + "--disable-libstdcxx-pch" + (string-append "--with-gxx-include-dir=3D" + #$output + "/include")))) (outputs '("out" "debug")) (inputs '()) (native-inputs '()) diff --git a/gnu/packages/patches/foo.patch b/gnu/packages/patches/foo.patch new file mode 100644 index 0000000000..5f3ccda91d =2D-- /dev/null +++ b/gnu/packages/patches/foo.patch @@ -0,0 +1,20 @@ +--- a/libstdc++-v3/src/c++17/floating_from_chars.cc ++++ b/libstdc++-v3/src/c++17/floating_from_chars.cc +@@ -495,10 +495,16 @@ + from_chars(const char* first, const char* last, __ieee128& value, + chars_format fmt) noexcept + { ++ errc ec =3D errc::invalid_argument; ++#if _GLIBCXX_USE_CXX11_ABI + buffer_resource mr; + pmr::string buf(&mr); ++#else ++ string buf; ++ if (!reserve_string(buf)) ++ return make_result(first, 0, {}, ec); ++#endif + size_t len =3D 0; +- errc ec =3D errc::invalid_argument; + __try + { + if (const char* pat =3D pattern(first, last, fmt, buf)) [[likely]] =2D-=20 2.32.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmQ4CGpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcKdxAAkuUBYDgcLRvtR2FAuCy1gjP/M2NsxJm2 yXIJ5FPzDpHgLapig5D2RglnE6oRzBvd+RthTUL1aelT5LOjfbcJhsp7jEigcUve yX9MMpcR1uIgabk+ds1Oi8VO3anOQtu076xtrFF5H/OkdjqiOFgDBj7X0Y8UWOS1 VEKOHdaeCXdhNoaAM9B6IXJGFo+TlemNEbpJUGLJnW0KgTRITUOMaKdomuc2QG9k /abaWeQ9iKDdda+WjgTrnh4JX4Q4/3wTPHLhzxqcl+HjDPRWYznRF5gIyUdR2gu9 1jPAO+ICgSQFQnxP6fMqJWyaV6rYVl2CojxlswUt5pk2zo1Raej47FW0HKjQI/vU GOVyHt2EkATtkVb7xwW2qpEsM04+jlNlw3a5LkAQHfu0V/lcI2WEm5jY6aYXJu8n WUdew2QeqQa3nbIulJj28hKORmJ05K2anA2x9gzE1etuY9ILr+N92NCZJgO7Q5yb SWqhXPpL/q+Nbi1sUe7rEXxzXkJemeejVqZBsf3rkbIKHeHYLTbGSG9LY5wVO2gn 3M2ysnUXj/sDxZLjYy1OE3CqtgjwrHCJhLzwruv2z9rYbXJJFk2pwjwxbNjWLbK8 khiWtf0Lx8teS8lJq1Mg6XACB+26Ryms1Z6fJDn3p5r0a1OMFIfRPllRs/QA/ZfM fyTcLgdBXJ8= =4Wf+ -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 13 10:06:46 2023 Received: (at 61879) by debbugs.gnu.org; 13 Apr 2023 14:06:46 +0000 Received: from localhost ([127.0.0.1]:44367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmxb3-0002TY-2y for submit@debbugs.gnu.org; Thu, 13 Apr 2023 10:06:46 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:36102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmxal-0002Si-0m for 61879@debbugs.gnu.org; Thu, 13 Apr 2023 10:06:42 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 58C6F4A; Thu, 13 Apr 2023 16:06:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IDhs29U7vvzS; Thu, 13 Apr 2023 16:06:20 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id B9DB8B9; Thu, 13 Apr 2023 16:06:19 +0200 (CEST) Date: Thu, 13 Apr 2023 16:06:16 +0200 From: Andreas Enge To: Christopher Baines Subject: Re: bug#61879: Powerpc on core-updates Message-ID: References: <87a60xcrdl.fsf@inria.fr> <87mt3byjrp.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87mt3byjrp.fsf@cbaines.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879 Cc: guix-devel@gnu.org, 61879@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 (-) Am Thu, Apr 13, 2023 at 02:46:00PM +0100 schrieb Christopher Baines: > Thanks for figuring this out Andreas! I've managed to apply this change > in the relevant place, and it appears to work. Good news, thanks! > + #$@(if (and (target-ppc64le?) > + (version>=? (package-version gcc) "11")) The file changed a lot on master, and the patch will not apply and should not be needed there. I did not check, but I think it is already not needed for gcc@12 any more. So we should probably check for the major version being equal to 11. It should be easy to check that it does not cause any rebuilds on the other architectures, and we cannot break powerpc more than it already is, so feel free to push something along these lines to core-updates. Andreas From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 13 12:57:53 2023 Received: (at 61879) by debbugs.gnu.org; 13 Apr 2023 16:57:54 +0000 Received: from localhost ([127.0.0.1]:44585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pn0Gf-00049N-9r for submit@debbugs.gnu.org; Thu, 13 Apr 2023 12:57:53 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:57400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pn0Gb-000496-PP for 61879@debbugs.gnu.org; Thu, 13 Apr 2023 12:57:51 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 6ACCB1F4B; Thu, 13 Apr 2023 18:57:43 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mMokhiBXJHTx; Thu, 13 Apr 2023 18:57:42 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 72C6C92; Thu, 13 Apr 2023 18:57:42 +0200 (CEST) Date: Thu, 13 Apr 2023 18:57:41 +0200 From: Andreas Enge To: 61879@debbugs.gnu.org, Christopher Baines Subject: Patch Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="vMqvCx5BsNxFeg6m" Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879 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 (-) --vMqvCx5BsNxFeg6m Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, attached is a new commit in old syntax, mixing both our commits. I have confirmed that it does not change the gcc-11 build on x86_64 and i686. But do we need "--force" for patching? Could you maybe check again whether this builds gcc-11 on powerpc? If yes, we can push it, and feel free to gexpify it in a separate commit. Andreas --vMqvCx5BsNxFeg6m Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="0001-gnu-gcc-11-Fix-build-on-powerpc64le.patch" Content-Transfer-Encoding: 8bit >From 9900f9e9b86550e7d336b04ad46fba088e28cbd6 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 13 Apr 2023 11:46:47 +0200 Subject: [PATCH] gnu: gcc-11: Fix build on powerpc64le. * gnu/packages/patches/gcc-11-libstdc++-powerpc.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/gcc.scm (make-libstdc++): Apply patch for gcc versions >= 11 and < 12 on ppc64le. Co-authored-by: Christopher Baines --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 11 ++++++++++- .../patches/gcc-11-libstdc++-powerpc.patch | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcc-11-libstdc++-powerpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index b07811f1cb..1255846462 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1184,6 +1184,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch \ %D%/packages/patches/gcc-12-cross-environment-variables.patch \ %D%/packages/patches/gcc-10-tree-sra-union-handling.patch \ + %D%/packages/patches/gcc-11-libstdc++-powerpc.patch \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a511cdbc45..ae324219d3 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012-2023 Ludovic Courtčs ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus -;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2015, 2023 Andreas Enge ;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -889,6 +889,15 @@ (define-public (make-libstdc++ gcc) ":") "\nAM_CXXFLAGS = "))))))) '()) + ,@(let ((version (package-version gcc))) + (if (and (target-ppc64le?) + (version>=? version "11") + (not (version>=? version "12"))) + `((add-after 'unpack 'patch-powerpc + (lambda _ + (invoke "patch" "--force" "-p1" "-i" + (search-patch "gcc-11-libstdc++-powerpc.patch"))))) + '())) ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64. (add-before 'chdir 'fix-rs6000-libdir (lambda _ diff --git a/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch b/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch new file mode 100644 index 0000000000..aff2ef16f1 --- /dev/null +++ b/gnu/packages/patches/gcc-11-libstdc++-powerpc.patch @@ -0,0 +1,18 @@ +diff -u -r gcc-11.3.0.alt/libstdc++-v3/src/c++17/floating_from_chars.cc gcc-11.3.0/libstdc++-v3/src/c++17/floating_from_chars.cc +--- gcc-11.3.0.alt/libstdc++-v3/src/c++17/floating_from_chars.cc 2023-04-13 11:36:08.169841428 +0200 ++++ gcc-11.3.0/libstdc++-v3/src/c++17/floating_from_chars.cc 2023-04-13 11:36:54.825827304 +0200 +@@ -495,8 +495,14 @@ + from_chars(const char* first, const char* last, __ieee128& value, + chars_format fmt) noexcept + { ++#if _GLIBCXX_USE_CXX11_ABI + buffer_resource mr; + pmr::string buf(&mr); ++#else ++ string buf; ++ if (!reserve_string(buf)) ++ return make_result(first, 0, {}, ec); ++#endif + size_t len = 0; + errc ec = errc::invalid_argument; + __try -- 2.39.2 --vMqvCx5BsNxFeg6m-- From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 14 04:16:09 2023 Received: (at 61879) by debbugs.gnu.org; 14 Apr 2023 08:16:09 +0000 Received: from localhost ([127.0.0.1]:45390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnEbI-0005Jz-VY for submit@debbugs.gnu.org; Fri, 14 Apr 2023 04:16:09 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:40320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnEbC-0005JA-OR for 61879@debbugs.gnu.org; Fri, 14 Apr 2023 04:16:06 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 6521773C; Fri, 14 Apr 2023 10:15:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4PnZf-54d5xk; Fri, 14 Apr 2023 10:15:54 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 04C6928A; Fri, 14 Apr 2023 10:15:53 +0200 (CEST) Date: Fri, 14 Apr 2023 10:15:52 +0200 From: Andreas Enge To: 61879@debbugs.gnu.org, Christopher Baines Subject: Re: Patch Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879 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 (-) Am Thu, Apr 13, 2023 at 06:57:41PM +0200 schrieb Andreas Enge: > attached is a new commit in old syntax, mixing both our commits. > I have confirmed that it does not change the gcc-11 build on x86_64 and i686. > But do we need "--force" for patching? > Could you maybe check again whether this builds gcc-11 on powerpc? I just pushed it, since it cannot break much... If CI shows it does not work, we can still revert it. Andreas From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 14 04:22:46 2023 Received: (at 61879) by debbugs.gnu.org; 14 Apr 2023 08:22:46 +0000 Received: from localhost ([127.0.0.1]:45423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnEhi-0005UY-29 for submit@debbugs.gnu.org; Fri, 14 Apr 2023 04:22:46 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnEhe-0005UP-Lu for 61879@debbugs.gnu.org; Fri, 14 Apr 2023 04:22:43 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 781781739B; Fri, 14 Apr 2023 09:22:41 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f7e6602a; Fri, 14 Apr 2023 08:22:40 +0000 (UTC) References: User-agent: mu4e 1.8.13; emacs 28.2 From: Christopher Baines To: Andreas Enge Subject: Re: Patch Date: Fri, 14 Apr 2023 09:20:03 +0100 In-reply-to: Message-ID: <87bkjqx48h.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879 Cc: 61879@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 Andreas Enge writes: > Am Thu, Apr 13, 2023 at 06:57:41PM +0200 schrieb Andreas Enge: >> attached is a new commit in old syntax, mixing both our commits. >> I have confirmed that it does not change the gcc-11 build on x86_64 and i686. >> But do we need "--force" for patching? >> Could you maybe check again whether this builds gcc-11 on powerpc? > > I just pushed it, since it cannot break much... If CI shows it does not > work, we can still revert it. I haven't tried this yet, but I've had a quick look. I'm not sure search-patches will work where it is, since that'll be running in the build environment, without any access to the patches in the Guix git repository. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmQ5DU5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XefLhAAmQlOuK59K0hFOCx88lEibGuxS7jhbwsZ nDUvsM2DKFBiCQBta/btiCy0Pk1zL/QfhkOQZQ74qlTNnS3eRJLw0lOx8T88iSPC ErWyQSIuF4sSJG72Qlxgmn6/lDW4GCKgFYp6bbyUfR1NVkGSH2+hwqPUQY8ozChC kDNqdkClD7TqfD3E4NBJpn1MJtrnr9kkYE5m+1CdSbPpGusIFSgO4mrjvJMmXmM4 XAKr4HiMnGs16NWMoEU3ApeOnRBYcGYDJa+D0uEJ8iFfIgNcqdmILcXrjG9uBR41 ppVJt/izqtgswJpxSSDmYwXAmWyaz+EA1/WdmOs99+N26g/uRe/wsK9buWkzukDr neSpSVvFL22/J/KqMZ+4wBBKieNaoycYf7lhZq9hBqUD09aPxXrW1N3G7qpawD4P YpjBdk+OOqvJFRBXHYy7mjb1H+yJqlUelXXCD35M+RhsvXd8nSf4ZH3FOosXGAc7 gEFqTGoM//7LWhzN+K/71tzdCmLxC3KEiKSzT/VRvsZKxNefEXl2tjeOw2yHxB0X PvvGI8aFYT2Jw9b3E60GoQdwi28KdAGTVsnvF0m118fkomhmvqz03eqqjZTeDrXS M27kOrWIVhoINUxyD5d8p+fQV+l/PiciDgaj5B1WyChHGZJ8SHxVO4iaaTiXnsh+ UEA0KYjvDUU= =bSUT -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 14 05:43:07 2023 Received: (at 61879) by debbugs.gnu.org; 14 Apr 2023 09:43:07 +0000 Received: from localhost ([127.0.0.1]:45538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnFxT-0007oy-Hv for submit@debbugs.gnu.org; Fri, 14 Apr 2023 05:43:07 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:37670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnFxR-0007oT-E4 for 61879@debbugs.gnu.org; Fri, 14 Apr 2023 05:43:06 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 0A5D228A; Fri, 14 Apr 2023 11:42:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 32orjyx01Ahz; Fri, 14 Apr 2023 11:42:58 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 58A1A277; Fri, 14 Apr 2023 11:42:58 +0200 (CEST) Date: Fri, 14 Apr 2023 11:42:56 +0200 From: Andreas Enge To: Christopher Baines Subject: Re: Patch Message-ID: References: <87bkjqx48h.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87bkjqx48h.fsf@cbaines.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879 Cc: 61879@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 (-) Am Fri, Apr 14, 2023 at 09:20:03AM +0100 schrieb Christopher Baines: > I haven't tried this yet, but I've had a quick look. I'm not sure > search-patches will work where it is, since that'll be running in the > build environment, without any access to the patches in the Guix git > repository. Good point. But is this not exactly like your previous commit, which I understood you had tested? But you are right: https://ci.guix.gnu.org/build/909454/log/raw error: in phase 'patch-powerpc': uncaught exception: unbound-variable #f "Unbound variable: ~S" (search-patch) #f phase `patch-powerpc' failed after 0.0 seconds I will revert (the good news: it indeed did not break any other architecture). If we do not have access to the patch during build, we would need to replace it by an invocation of substitute*, with a lot of escaping of special characters like line ends, which would be annoying to test (well, one could test on x86_64 on a dummy package with the same source as gcc-11). Andreas From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 14 06:45:16 2023 Received: (at 61879) by debbugs.gnu.org; 14 Apr 2023 10:45:17 +0000 Received: from localhost ([127.0.0.1]:45624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnGvV-0001g9-K2 for submit@debbugs.gnu.org; Fri, 14 Apr 2023 06:45:16 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnGvN-0001fG-It for 61879@debbugs.gnu.org; Fri, 14 Apr 2023 06:45:08 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 27EC9171D0; Fri, 14 Apr 2023 11:45:00 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 4fc8b657; Fri, 14 Apr 2023 10:44:58 +0000 (UTC) References: <87bkjqx48h.fsf@cbaines.net> User-agent: mu4e 1.8.13; emacs 28.2 From: Christopher Baines To: Andreas Enge Subject: Re: Patch Date: Fri, 14 Apr 2023 11:37:05 +0100 In-reply-to: Message-ID: <873552wxnb.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61879 Cc: 61879@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 Content-Transfer-Encoding: quoted-printable Andreas Enge writes: > Am Fri, Apr 14, 2023 at 09:20:03AM +0100 schrieb Christopher Baines: >> I haven't tried this yet, but I've had a quick look. I'm not sure >> search-patches will work where it is, since that'll be running in the >> build environment, without any access to the patches in the Guix git >> repository. > > Good point. But is this not exactly like your previous commit, which > I understood you had tested? But you are right: > https://ci.guix.gnu.org/build/909454/log/raw > error: in phase 'patch-powerpc': uncaught exception: > unbound-variable #f "Unbound variable: ~S" (search-patch) #f=20 > phase `patch-powerpc' failed after 0.0 seconds > I will revert (the good news: it indeed did not break any other > architecture). > > If we do not have access to the patch during build, we would need to > replace it by an invocation of substitute*, with a lot of escaping of > special characters like line ends, which would be annoying to test > (well, one could test on x86_64 on a dummy package with the same source > as gcc-11). The changes I muddled together differed in that the search-patches bit was ungexp'ed, so the patch file was handled through that mechanism. The other important change is the actual patch itself differed as well (ec needs moving up a bit). I've made those changes to the commit you pushed earlier and pushed to core-updates now. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmQ5LqhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XflAg/+IfCZx0YF66Ea55PszhFnTHK1dir5/AL3 3BsB5Ls1o3yUJYY4CHd7yapnS9C4KEhMS0I5VdtPe+0R52rtTkLq1mKplgfe6bZn 6vZ25F9aFXEnIOqpWPWm0Il1kmjAnc4rfQyWggWBN69rGtU9RieHS6LUNTe6acBx +7sz2dTu9nXW0xKjrSwbWlptCndCneG0rb0bNGbLmI0hjDXvcAoVtNiIiA6wDWYu yWimSlfndwWnSF1RvQtREOrAh19AVTAIwIIhRLQ15yXA85uHR4voWrZIhM8aTOSJ mn+cRJg1z6OsXeyRLJDWFOtpcwI7rIi/rQEy7ES2eTG9EZkhlFtHgpvY1HXF0kth dJMFyIHPIuRDbwQbnxDK1IW9swCwxE3iP04AiRtrlqqHUjPCNJ3meJPK/MwQbaWv VNSKATnnlIyYkViINi+L31oEbV5PdpLFGZKvaOdbDa1hj0neMWrNc2cARtQgS3XW /+9rnZZCv2ebCXvsNfpmhV+R8NSXRcjWvaRY9RnjQJXHNEnNzrk0X+/6shFwhwP1 8oZtMySqUIMxD6E1UoDvubK9KDYP2c5PJVOcEZl3Uxc5UXGMDAfr1IKTXW/UZIi5 aPLeNiWaCznE9Awz2lkhCybZp34YyBT0E02sbpjf9rzqDihJX2TrfTPePWHxcVcU Qdjqg9RhMaY= =EMAq -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 14 08:10:51 2023 Received: (at 61879-done) by debbugs.gnu.org; 14 Apr 2023 12:10:51 +0000 Received: from localhost ([127.0.0.1]:45714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnIGQ-0006qA-V0 for submit@debbugs.gnu.org; Fri, 14 Apr 2023 08:10:51 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:50252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnIGP-0006pw-K5 for 61879-done@debbugs.gnu.org; Fri, 14 Apr 2023 08:10:50 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id EF30F1B6A; Fri, 14 Apr 2023 14:10:43 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VChnD-DXGzdH; Fri, 14 Apr 2023 14:10:43 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 897A83FC; Fri, 14 Apr 2023 14:10:43 +0200 (CEST) Date: Fri, 14 Apr 2023 14:10:42 +0200 From: Andreas Enge To: Christopher Baines Subject: Re: Patch Message-ID: References: <87bkjqx48h.fsf@cbaines.net> <873552wxnb.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <873552wxnb.fsf@cbaines.net> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61879-done Cc: 61879-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: -1.0 (-) Am Fri, Apr 14, 2023 at 11:37:05AM +0100 schrieb Christopher Baines: > I've made those changes to the commit you pushed earlier and pushed to > core-updates now. That did it, lots of green dots in the dashboard. Thanks! Closing the bug now. Andreas From unknown Sat Aug 09 01:07:02 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 13 May 2023 11:24:08 +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