From patchwork Sun Jul 12 23:40:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 23215 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 BDAF127BBE1; Mon, 13 Jul 2020 00:41:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8A2B927BBE3 for ; Mon, 13 Jul 2020 00:41:07 +0100 (BST) Received: from localhost ([::1]:48462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1julal-0006W0-37 for patchwork@mira.cbaines.net; Sun, 12 Jul 2020 19:41:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1julag-0006Vr-9Y for guix-patches@gnu.org; Sun, 12 Jul 2020 19:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1julag-0006o3-0c for guix-patches@gnu.org; Sun, 12 Jul 2020 19:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1julaf-0005XZ-U7 for guix-patches@gnu.org; Sun, 12 Jul 2020 19:41:01 -0400 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?b?S8SFZHppb8WCa2E=?= 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?b?S8SFZHppb8WCa2E=?= 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 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-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 * 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