From unknown Sat Sep 13 08:55:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42339] [PATCH core-updates] gnu: glibc-intermediate: Fixup the pre-configure phase. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Jul 2020 23:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42339 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42339@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159459725721277 (code B ref -1); Sun, 12 Jul 2020 23:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jul 2020 23:40:57 +0000 Received: from localhost ([127.0.0.1]:47136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1julaa-0005X7-Vb for submit@debbugs.gnu.org; Sun, 12 Jul 2020 19:40:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:35910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1julaZ-0005Wy-4I for submit@debbugs.gnu.org; Sun, 12 Jul 2020 19:40:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1julaY-0006VT-SZ for guix-patches@gnu.org; Sun, 12 Jul 2020 19:40:54 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:43996) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1julaW-0006k9-KX for guix-patches@gnu.org; Sun, 12 Jul 2020 19:40:54 -0400 Received: (qmail 5197 invoked by uid 1009); 13 Jul 2020 01:40:49 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25870. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.016823 secs); 12 Jul 2020 23:40:49 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 13 Jul 2020 01:40:49 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Mon, 13 Jul 2020 01:40:39 +0200 Message-Id: <20200712234039.17871-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=37.59.186.212; envelope-from=kuba@kadziolka.net; helo=pat.zlotemysli.pl X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/12 19:40:50 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) 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 (---) * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)[arguments]: Don't patch sunrpc, as it's no longer required. Tweak C_INCLUDE_PATH and CPLUS_INCLUDE_PATH instead of CPATH. --- Hi Guix, I have stumbled upon this phase while I was working on making substitute not fail silently. Turns out this substitution is no longer necessary since we aren't building with --enable-obsolete-rpc anymore. I'm not sure about the unsetenv parts, though. Switching them to {C,CPLUS}_INCLUDE_PATH, which is where the header paths actually are right now, did not change how `guix graph --type=references` looks for glibc-final (nor glibc-final-with-bootstrap-bash, for that matter). The phase itself was introduced in... commit 1c93be5600fb90a64cbbdf7a55061902d2ff150a Author: Ludovic Courtès Date: Sat Jun 7 17:23:53 2014 +0200 gnu: glibc: Make sure the bootstrap libc is not in $CPATH. This fixes a bug whereby the bootstrap-glibc headers could be picked up when building libc.so, which could be noticed by the fact that the .debug files contained references to bootstrap-glibc. * gnu/packages/base.scm (glibc-final-with-bootstrap-bash)[arguments]: Add 'pre-configure' phase. [inputs]: Remove 'alist-delete' call. The debug output does not refer to a bootstrap glibc anymore whether the phase is there or not, though it does refer to gcc-cross-boot0:lib. Does this mean that the phase is simply obsolete, and only the hurd parts should remain, or is the reference to gcc a bug? Perhaps gcc should have a separate output for the includes it provides (stdarg and such) so that this reference doesn't bring in the whole mesboot tree? This would improve the closure of gcc-toolchain:debug... Thoughts? gnu/packages/commencement.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1a9c0eaf29..c645ac2589 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3268,9 +3268,9 @@ memoized as a function of '%current-system'." `(modify-phases ,phases (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) - ;; Don't clobber CPATH with the bootstrap libc. - (setenv "NATIVE_CPATH" (getenv "CPATH")) - (unsetenv "CPATH") + ;; Don't clobber include paths with the bootstrap libc. + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") ;; Tell 'libpthread' where to find 'libihash' on Hurd systems. ,@(if (hurd-system?) @@ -3281,13 +3281,6 @@ memoized as a function of '%current-system'." (assoc-ref %build-inputs "kernel-headers") "/lib/libihash.a\n")))) '()) - - ;; 'rpcgen' needs native libc headers to be built. - (substitute* "sunrpc/Makefile" - (("sunrpc-CPPFLAGS =.*" all) - (string-append "CPATH = $(NATIVE_CPATH)\n" - "export CPATH\n" - all "\n"))) #t))))))) (propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0)))) (native-inputs -- 2.27.0 From unknown Sat Sep 13 08:55:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42339] [PATCH core-updates] gnu: glibc-intermediate: Fixup the pre-configure phase. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jul 2020 22:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42339 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Cc: 42339@debbugs.gnu.org Received: via spool by 42339-submit@debbugs.gnu.org id=B42339.159545523327625 (code B ref 42339); Wed, 22 Jul 2020 22:01:01 +0000 Received: (at 42339) by debbugs.gnu.org; 22 Jul 2020 22:00:33 +0000 Received: from localhost ([127.0.0.1]:43301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyMmv-0007BU-4R for submit@debbugs.gnu.org; Wed, 22 Jul 2020 18:00:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyMms-0007BH-SM for 42339@debbugs.gnu.org; Wed, 22 Jul 2020 18:00:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:56868) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyMmm-0001JB-VT; Wed, 22 Jul 2020 18:00:24 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57882 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jyMmm-0003Zd-9q; Wed, 22 Jul 2020 18:00:24 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200712234039.17871-1-kuba@kadziolka.net> Date: Thu, 23 Jul 2020 00:00:22 +0200 In-Reply-To: <20200712234039.17871-1-kuba@kadziolka.net> ("Jakub \=\?utf-8\?B\?S8SFZHppb8WCa2EiJ3M\=\?\= message of "Mon, 13 Jul 2020 01:40:39 +0200") Message-ID: <874kpzgqh5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) 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 (---) Hello, Jakub K=C4=85dzio=C5=82ka skribis: > * gnu/packages/commencement.scm > (glibc-final-with-bootstrap-bash)[arguments]: Don't patch sunrpc, > as it's no longer required. Tweak C_INCLUDE_PATH and > CPLUS_INCLUDE_PATH instead of CPATH. > --- > > Hi Guix, > > I have stumbled upon this phase while I was working on making substitute > not fail silently. Turns out this substitution is no longer necessary > since we aren't building with --enable-obsolete-rpc anymore. I'm not > sure about the unsetenv parts, though. Switching them to > {C,CPLUS}_INCLUDE_PATH, which is where the header paths actually are > right now, did not change how `guix graph --type=3Dreferences` looks for > glibc-final (nor glibc-final-with-bootstrap-bash, for that matter). > > The phase itself was introduced in... > > commit 1c93be5600fb90a64cbbdf7a55061902d2ff150a > Author: Ludovic Court=C3=A8s > Date: Sat Jun 7 17:23:53 2014 +0200 > > gnu: glibc: Make sure the bootstrap libc is not in $CPATH. > > This fixes a bug whereby the bootstrap-glibc headers could be picked = up > when building libc.so, which could be noticed by the fact that the > .debug files contained references to bootstrap-glibc. > > * gnu/packages/base.scm (glibc-final-with-bootstrap-bash)[arguments]: > Add 'pre-configure' phase. > [inputs]: Remove 'alist-delete' call. > > The debug output does not refer to a bootstrap glibc anymore whether the = phase > is there or not, though it does refer to gcc-cross-boot0:lib. Does this > mean that the phase is simply obsolete, and only the hurd parts should > remain, or is the reference to gcc a bug? Perhaps gcc should have a > separate output for the includes it provides (stdarg and such) so that > this reference doesn't bring in the whole mesboot tree? This would > improve the closure of gcc-toolchain:debug... Oooh, nice. LGTM! Please confirm that nothing breaks (everything builds at least up to =E2=80=98gcc-final=E2=80=99) and you can push to =E2=80=98core-updates=E2= =80=99. Thank you! Ludo=E2=80=99. From unknown Sat Sep 13 08:55:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42339] [PATCH core-updates] gnu: glibc-intermediate: Fixup the pre-configure phase. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jul 2020 22:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42339 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 42339@debbugs.gnu.org Received: via spool by 42339-submit@debbugs.gnu.org id=B42339.159545744831087 (code B ref 42339); Wed, 22 Jul 2020 22:38:01 +0000 Received: (at 42339) by debbugs.gnu.org; 22 Jul 2020 22:37:28 +0000 Received: from localhost ([127.0.0.1]:43348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyNMd-00085L-Vb for submit@debbugs.gnu.org; Wed, 22 Jul 2020 18:37:28 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:42460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyNMa-00085A-JA for 42339@debbugs.gnu.org; Wed, 22 Jul 2020 18:37:26 -0400 Received: (qmail 29514 invoked by uid 1009); 23 Jul 2020 00:37:22 +0200 Received: from user-94-254-154-173.play-internet.pl (kuba@kadziolka.net@user-94-254-154-173.play-internet.pl) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25880. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(94.254.154.173):. Processed in 0.068077 secs); 22 Jul 2020 22:37:22 -0000 Received: from user-94-254-154-173.play-internet.pl (HELO gravity) (kuba@kadziolka.net@94.254.154.173) by pat.zlotemysli.pl with SMTP; 23 Jul 2020 00:37:22 +0200 Date: Thu, 23 Jul 2020 00:37:21 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200722223721.upm7cf2gnghfv2pp@gravity> References: <20200712234039.17871-1-kuba@kadziolka.net> <874kpzgqh5.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hxfjp2rds47b22yn" Content-Disposition: inline In-Reply-To: <874kpzgqh5.fsf@gnu.org> X-Spam-Score: 0.0 (/) 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 (-) --hxfjp2rds47b22yn Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 23, 2020 at 12:00:22AM +0200, Ludovic Court=C3=A8s wrote: > Hello, >=20 > Jakub K=C4=85dzio=C5=82ka skribis: >=20 > > * gnu/packages/commencement.scm > > (glibc-final-with-bootstrap-bash)[arguments]: Don't patch sunrpc, > > as it's no longer required. Tweak C_INCLUDE_PATH and > > CPLUS_INCLUDE_PATH instead of CPATH. > > --- > > > > Hi Guix, > > > > I have stumbled upon this phase while I was working on making substitute > > not fail silently. Turns out this substitution is no longer necessary > > since we aren't building with --enable-obsolete-rpc anymore. I'm not > > sure about the unsetenv parts, though. Switching them to > > {C,CPLUS}_INCLUDE_PATH, which is where the header paths actually are > > right now, did not change how `guix graph --type=3Dreferences` looks for > > glibc-final (nor glibc-final-with-bootstrap-bash, for that matter). > > > > The phase itself was introduced in... > > > > commit 1c93be5600fb90a64cbbdf7a55061902d2ff150a > > Author: Ludovic Court=C3=A8s > > Date: Sat Jun 7 17:23:53 2014 +0200 > > > > gnu: glibc: Make sure the bootstrap libc is not in $CPATH. > > > > This fixes a bug whereby the bootstrap-glibc headers could be picke= d up > > when building libc.so, which could be noticed by the fact that the > > .debug files contained references to bootstrap-glibc. > > > > * gnu/packages/base.scm (glibc-final-with-bootstrap-bash)[arguments= ]: > > Add 'pre-configure' phase. > > [inputs]: Remove 'alist-delete' call. > > > > The debug output does not refer to a bootstrap glibc anymore whether th= e phase > > is there or not, though it does refer to gcc-cross-boot0:lib. Does this > > mean that the phase is simply obsolete, and only the hurd parts should > > remain, or is the reference to gcc a bug? Perhaps gcc should have a > > separate output for the includes it provides (stdarg and such) so that > > this reference doesn't bring in the whole mesboot tree? This would > > improve the closure of gcc-toolchain:debug... >=20 > Oooh, nice. LGTM! Thanks for your review! > Please confirm that nothing breaks (everything builds at least up to > =E2=80=98gcc-final=E2=80=99) and you can push to =E2=80=98core-updates=E2= =80=99. I have confirmed that hello builds both natively and cross-built. On a similar topic, the same test succeeded for removing the native-gcc input. As the comment suggests, it was only being used for --enable-obsolete-rpc. I am thus considering a v2 that also removes said input. Does that make sense? Regards, Jakub K=C4=85dzio=C5=82ka --hxfjp2rds47b22yn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl8Yv6AACgkQ4xWnWEYT FWQVcg/8Daopa7etOE3jME3v7Yt6+4GfShS4XPcSvSYOu6PqxM7aVwk6wsg4Fo/X zC7yI/ar/T6zd0uBJRAL1Q9QI8mr5hEQ7aCH1QQMEVNE/PsVSFFFGBdyOk8rlsI3 sZw2H2GTUdDNDQ9pA4iU1ETPOZlBqWprFkYc3USfE2sNcu4Y2ZJgKdmUUObdeCST HQhMo9E3fpm0CORANM3wDHOTI7mGZVdLi2i6OzqVRzYczVXatsFMAAm9XhwW8J2y FKt0KUKKEBEseb6R2ir9PISAZx6oBpP/b6RAnSzy/vM3BUU7vVvqhjmGM+m4NunF V/0+4jc+VJ1BD12X+Z/wHcfTFh6pI0sJCAdj1oKSgEuhoGzJ+5LLLRrLgyBUcuxy kWFM7bEP154duFUqahaLnNnUcjCs/SpV+R7UDJSUFT+NSs9pyXK31O783pLtPuxz iyoMozQTlkmyqHvxuoLxT1dhCMa5fc5J87Cx5nTQB3HFO0UMUcHwAYYRLRSHVlh5 xw0AF/4UdzyA9c72mJCOgcSP4FixDnus9p5+Eq1gxedu/GpRuNjacF+mhdClgX/A afBpjq2VKXxtNJA/vVwD4FYn5/FIka7ylyWusHKAIGQIEluBeDZ9G/vfE7UYFaFi GQgbJs6cq2K+U50v+tB+pclUK2ycRCoXtpAgwGNlU4oaqJihX+Y= =sNVr -----END PGP SIGNATURE----- --hxfjp2rds47b22yn-- From unknown Sat Sep 13 08:55:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#42339] [PATCH core-updates] gnu: glibc-intermediate: Fixup the pre-configure phase. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Jul 2020 07:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42339 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Cc: 42339@debbugs.gnu.org Received: via spool by 42339-submit@debbugs.gnu.org id=B42339.159549056818983 (code B ref 42339); Thu, 23 Jul 2020 07:50:01 +0000 Received: (at 42339) by debbugs.gnu.org; 23 Jul 2020 07:49:28 +0000 Received: from localhost ([127.0.0.1]:43835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyVyq-0004w6-HD for submit@debbugs.gnu.org; Thu, 23 Jul 2020 03:49:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyVyo-0004vn-2W for 42339@debbugs.gnu.org; Thu, 23 Jul 2020 03:49:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37028) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyVyi-0003cy-96; Thu, 23 Jul 2020 03:49:20 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59710 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jyVyh-0003U0-G3; Thu, 23 Jul 2020 03:49:19 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200712234039.17871-1-kuba@kadziolka.net> <874kpzgqh5.fsf@gnu.org> <20200722223721.upm7cf2gnghfv2pp@gravity> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 6 Thermidor an 228 de la =?UTF-8?Q?R=C3=A9volution?= 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: Thu, 23 Jul 2020 09:49:17 +0200 In-Reply-To: <20200722223721.upm7cf2gnghfv2pp@gravity> ("Jakub \=\?utf-8\?B\?S8SFZHppb8WCa2EiJ3M\=\?\= message of "Thu, 23 Jul 2020 00:37:21 +0200") Message-ID: <87wo2uekn6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) 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 (---) Hi, Jakub K=C4=85dzio=C5=82ka skribis: > On Thu, Jul 23, 2020 at 12:00:22AM +0200, Ludovic Court=C3=A8s wrote: >> Hello, >>=20 >> Jakub K=C4=85dzio=C5=82ka skribis: >>=20 >> > * gnu/packages/commencement.scm >> > (glibc-final-with-bootstrap-bash)[arguments]: Don't patch sunrpc, >> > as it's no longer required. Tweak C_INCLUDE_PATH and >> > CPLUS_INCLUDE_PATH instead of CPATH. [...] >> > The debug output does not refer to a bootstrap glibc anymore whether t= he phase >> > is there or not, though it does refer to gcc-cross-boot0:lib. Does this >> > mean that the phase is simply obsolete, and only the hurd parts should >> > remain, or is the reference to gcc a bug? Perhaps gcc should have a >> > separate output for the includes it provides (stdarg and such) so that >> > this reference doesn't bring in the whole mesboot tree? This would >> > improve the closure of gcc-toolchain:debug... >>=20 >> Oooh, nice. LGTM! > > Thanks for your review! > >> Please confirm that nothing breaks (everything builds at least up to >> =E2=80=98gcc-final=E2=80=99) and you can push to =E2=80=98core-updates= =E2=80=99. > > I have confirmed that hello builds both natively and cross-built. On a > similar topic, the same test succeeded for removing the native-gcc input. > As the comment suggests, it was only being used for --enable-obsolete-rpc. > I am thus considering a v2 that also removes said input. Does that make > sense? Yes it does (again provided nothing breaks). Thank you! Ludo=E2=80=99. From unknown Sat Sep 13 08:55:32 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Subject: bug#42339: closed (Re: [bug#42339] [PATCH core-updates] gnu: glibc-intermediate: Fixup the pre-configure phase.) Message-ID: References: <20200723221545.fqhkq6rkfjuyhadi@gravity> <20200712234039.17871-1-kuba@kadziolka.net> X-Gnu-PR-Message: they-closed 42339 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 42339@debbugs.gnu.org Date: Thu, 23 Jul 2020 22:16:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1595542562-30823-1" This is a multi-part message in MIME format... ------------=_1595542562-30823-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #42339: [PATCH core-updates] gnu: glibc-intermediate: Fixup the pre-configu= re phase. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 42339@debbugs.gnu.org. --=20 42339: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D42339 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1595542562-30823-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 42339-done) by debbugs.gnu.org; 23 Jul 2020 22:15:55 +0000 Received: from localhost ([127.0.0.1]:46241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyjVL-00080r-En for submit@debbugs.gnu.org; Thu, 23 Jul 2020 18:15:55 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:57354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyjVK-00080j-6a for 42339-done@debbugs.gnu.org; Thu, 23 Jul 2020 18:15:55 -0400 Received: (qmail 23779 invoked by uid 1009); 24 Jul 2020 00:15:52 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25881. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.070996 secs); 23 Jul 2020 22:15:52 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 24 Jul 2020 00:15:52 +0200 Date: Fri, 24 Jul 2020 00:15:45 +0200 From: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#42339] [PATCH core-updates] gnu: glibc-intermediate: Fixup the pre-configure phase. Message-ID: <20200723221545.fqhkq6rkfjuyhadi@gravity> References: <20200712234039.17871-1-kuba@kadziolka.net> <874kpzgqh5.fsf@gnu.org> <20200722223721.upm7cf2gnghfv2pp@gravity> <87wo2uekn6.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="sidhkshtj3mcek7a" Content-Disposition: inline In-Reply-To: <87wo2uekn6.fsf@gnu.org> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42339-done Cc: 42339-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 (-) --sidhkshtj3mcek7a Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 23, 2020 at 09:49:17AM +0200, Ludovic Court=C3=A8s wrote: > Hi, >=20 > Jakub K=C4=85dzio=C5=82ka skribis: >=20 > > On Thu, Jul 23, 2020 at 12:00:22AM +0200, Ludovic Court=C3=A8s wrote: > >> Hello, > >>=20 > >> Jakub K=C4=85dzio=C5=82ka skribis: > >>=20 > >> > * gnu/packages/commencement.scm > >> > (glibc-final-with-bootstrap-bash)[arguments]: Don't patch sunrpc, > >> > as it's no longer required. Tweak C_INCLUDE_PATH and > >> > CPLUS_INCLUDE_PATH instead of CPATH. >=20 > [...] >=20 > >> > The debug output does not refer to a bootstrap glibc anymore whether= the phase > >> > is there or not, though it does refer to gcc-cross-boot0:lib. Does t= his > >> > mean that the phase is simply obsolete, and only the hurd parts shou= ld > >> > remain, or is the reference to gcc a bug? Perhaps gcc should have a > >> > separate output for the includes it provides (stdarg and such) so th= at > >> > this reference doesn't bring in the whole mesboot tree? This would > >> > improve the closure of gcc-toolchain:debug... > >>=20 > >> Oooh, nice. LGTM! > > > > Thanks for your review! > > > >> Please confirm that nothing breaks (everything builds at least up to > >> =E2=80=98gcc-final=E2=80=99) and you can push to =E2=80=98core-updates= =E2=80=99. > > > > I have confirmed that hello builds both natively and cross-built. On a > > similar topic, the same test succeeded for removing the native-gcc inpu= t. > > As the comment suggests, it was only being used for --enable-obsolete-r= pc. > > I am thus considering a v2 that also removes said input. Does that make > > sense? >=20 > Yes it does (again provided nothing breaks). >=20 > Thank you! Thanks, patches pushed! --sidhkshtj3mcek7a Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl8aDBEACgkQ4xWnWEYT FWRnzw//fPSe/VYJBumFnkXgBJWfpU9VTHJvtcQrNBvXS0hv0ya3Cn7h2m8nTMum 8ZqitXGEJh+qgQ5+cM0X5jYHSjE7h0mULsTweZPlTWeiNfPF7QMPH0Ee7SXwGctm TeubLv0cp7hIwcFzFiVI+8kaBHsfFxFBgGqLb6fnJwKlJpP6ttXCHO+34luGZkiR nowB6sTC2cPI3pdTJnhUcFd1DYkcK7fFOfYG88GHOAxj22C+2kQAHhPUb8hGyrtB Jw1lFfdo1Pl0FvHl4mba5SI39IlZYSorU4oZ/Q/nycDqs+FLiGpTJJbhBNbsPJiQ 563TMh2YloGrqaZqAPJtNmmtJ1/eT5F3reHR0cwEn4Aa+FGkLYMdLCTlJNlq3R20 SuIJFvr2qtj8Dnin2nqbTbw+YKWwsFH6InYwWFXrxn0uJjiNOL9f6BX5c911El9d skd9/pCy6HsSMTNplqGw0TbRgxshDm69zwSKhjKrcShxmv1kC4xo2ohsNmyHKGXb u9IlXmgRoKlVK0In/xwoYZPW6BZsaIANmbe0PEJXdVpml00gp7oI9ZGGSwi0X9oY 6+1m8+gfa8j7NMr1dItdxbWGVP/6BHdWfNRNrBzRKIVSa643GP4bebvUAaZr19ch 62T2cncc3+BLH+VKMF2etD7Ge2dsD6pAZaRsMiDUnkOIsEN4TbM= =m4oV -----END PGP SIGNATURE----- --sidhkshtj3mcek7a-- ------------=_1595542562-30823-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Jul 2020 23:40:57 +0000 Received: from localhost ([127.0.0.1]:47136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1julaa-0005X7-Vb for submit@debbugs.gnu.org; Sun, 12 Jul 2020 19:40:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:35910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1julaZ-0005Wy-4I for submit@debbugs.gnu.org; Sun, 12 Jul 2020 19:40:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1julaY-0006VT-SZ for guix-patches@gnu.org; Sun, 12 Jul 2020 19:40:54 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:43996) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1julaW-0006k9-KX for guix-patches@gnu.org; Sun, 12 Jul 2020 19:40:54 -0400 Received: (qmail 5197 invoked by uid 1009); 13 Jul 2020 01:40:49 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25870. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.016823 secs); 12 Jul 2020 23:40:49 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 13 Jul 2020 01:40:49 +0200 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= To: guix-patches@gnu.org Subject: [PATCH core-updates] gnu: glibc-intermediate: Fixup the pre-configure phase. Date: Mon, 13 Jul 2020 01:40:39 +0200 Message-Id: <20200712234039.17871-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=37.59.186.212; envelope-from=kuba@kadziolka.net; helo=pat.zlotemysli.pl X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/12 19:40:50 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 (---) * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash)[arguments]: Don't patch sunrpc, as it's no longer required. Tweak C_INCLUDE_PATH and CPLUS_INCLUDE_PATH instead of CPATH. --- Hi Guix, I have stumbled upon this phase while I was working on making substitute not fail silently. Turns out this substitution is no longer necessary since we aren't building with --enable-obsolete-rpc anymore. I'm not sure about the unsetenv parts, though. Switching them to {C,CPLUS}_INCLUDE_PATH, which is where the header paths actually are right now, did not change how `guix graph --type=references` looks for glibc-final (nor glibc-final-with-bootstrap-bash, for that matter). The phase itself was introduced in... commit 1c93be5600fb90a64cbbdf7a55061902d2ff150a Author: Ludovic Courtès Date: Sat Jun 7 17:23:53 2014 +0200 gnu: glibc: Make sure the bootstrap libc is not in $CPATH. This fixes a bug whereby the bootstrap-glibc headers could be picked up when building libc.so, which could be noticed by the fact that the .debug files contained references to bootstrap-glibc. * gnu/packages/base.scm (glibc-final-with-bootstrap-bash)[arguments]: Add 'pre-configure' phase. [inputs]: Remove 'alist-delete' call. The debug output does not refer to a bootstrap glibc anymore whether the phase is there or not, though it does refer to gcc-cross-boot0:lib. Does this mean that the phase is simply obsolete, and only the hurd parts should remain, or is the reference to gcc a bug? Perhaps gcc should have a separate output for the includes it provides (stdarg and such) so that this reference doesn't bring in the whole mesboot tree? This would improve the closure of gcc-toolchain:debug... Thoughts? gnu/packages/commencement.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1a9c0eaf29..c645ac2589 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3268,9 +3268,9 @@ memoized as a function of '%current-system'." `(modify-phases ,phases (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) - ;; Don't clobber CPATH with the bootstrap libc. - (setenv "NATIVE_CPATH" (getenv "CPATH")) - (unsetenv "CPATH") + ;; Don't clobber include paths with the bootstrap libc. + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") ;; Tell 'libpthread' where to find 'libihash' on Hurd systems. ,@(if (hurd-system?) @@ -3281,13 +3281,6 @@ memoized as a function of '%current-system'." (assoc-ref %build-inputs "kernel-headers") "/lib/libihash.a\n")))) '()) - - ;; 'rpcgen' needs native libc headers to be built. - (substitute* "sunrpc/Makefile" - (("sunrpc-CPPFLAGS =.*" all) - (string-append "CPATH = $(NATIVE_CPATH)\n" - "export CPATH\n" - all "\n"))) #t))))))) (propagated-inputs `(("kernel-headers" ,(kernel-headers-boot0)))) (native-inputs -- 2.27.0 ------------=_1595542562-30823-1--