From patchwork Fri Jun 21 12:26:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 14366 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 99A571712C; Fri, 21 Jun 2019 13:42:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4BB511711F for ; Fri, 21 Jun 2019 13:42:02 +0100 (BST) Received: from localhost ([::1]:33574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIrh-0007M1-Jr for patchwork@mira.cbaines.net; Fri, 21 Jun 2019 08:42:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35168) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIdH-0005IU-Bj for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heIdD-0005d8-WD for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1heIdB-0005Yb-TZ for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1heIdB-0006u9-OP for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36322] [PATCH 1/4] gnu: make-bootstrap: Remove obsolete header file. References: <20190621122411.17847-1-mbakke@fastmail.com> In-Reply-To: <20190621122411.17847-1-mbakke@fastmail.com> Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2019 12:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36322 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36322@debbugs.gnu.org Received: via spool by 36322-submit@debbugs.gnu.org id=B36322.156111999926480 (code B ref 36322); Fri, 21 Jun 2019 12:27:01 +0000 Received: (at 36322) by debbugs.gnu.org; 21 Jun 2019 12:26:39 +0000 Received: from localhost ([127.0.0.1]:49864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcp-0006sx-Bd for submit@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:39 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:56247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcm-0006sd-Pp for 36322@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:37 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 24497368 for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:31 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jun 2019 08:26:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=duyElkPDXv/zS1OfpfwIzVffad 7D4dr3l/OQynWNyJg=; b=bRbtCFnjccoi03Jh1xO73djKuhSJSguwUb0y/JkuKT CmM8G0aHHauue/bgAgoG3KD7tnurq7aD7CNMBhv7H/Px8WtNb98u3POPE0jVjyLs Wp6gKWBW7uL0mImkyx7oDcRBELOt7xhmuoJFKouy+vyHLneoC8ga2WCd241UUgPK zktC3I7JMARZ+vXQP1vKbqWDP/WDhMyHiJrdr9115bBbzhamOBPzXQWQy9FBkE1R 6cia/gt0cUx0iZtEPwApYAe5UkuFQtFfVQUCeih0VplETTgn23WvVGU/Az875gHX 0exkXpX88kzkkFPVFcnB05lJsSiPXxVI9ctCFjHN0oTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=duyElkPDXv/zS1Ofp fwIzVffad7D4dr3l/OQynWNyJg=; b=rAPo0bIrfcIqMK+UpXRMYUYtVrrT2Ht5t uhWPzYDKjVts8sCQWh55QfEjucYAdKPDEzV1j0UhNyQvyOtgOG+fHy944svTjdRS YbQu7gcJqMgleFZiUH6o1DlhBfyRMo2fW9zPgUMzA05L++B1AIhSGNsV57qaISq5 +7isC6arjXoxQr50PmK3ssFs2IZbtI58eD41gKnO2qQWyGXEm0MPAILc2F8snk7u 1bJRyiKRM0l7fEOmHz63DkgW6RYEF2BfCSkwq86Ok5GDF4kHJQ0d1ICSqcLWcRKB Dr+6bIgUXeSw8soZm8r1JVMEBGC10mcaLRj9/2yPmYWK+mNpmG5cQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrtdeigdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgr ihhlrdgtohhmqeenucfkphepiedvrdduiedrvddviedrudegtdenucfrrghrrghmpehmrg hilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtghomhenucevlhhushhtvghr ufhiiigvpedu X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 47FA5380089 for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:30 -0400 (EDT) From: Marius Bakke Date: Fri, 21 Jun 2019 14:26:25 +0200 Message-Id: <20190621122628.18174-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * guix/build/make-bootstrap.scm (copy-linux-headers): Do not install 'a.out.h'. --- guix/build/make-bootstrap.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index e5ef1d6d2b..0d29338ce3 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -47,7 +47,6 @@ bootstrap libc." (install-file (pk 'src (string-append kernel-headers "/include/linux/" file)) (pk 'dest (string-append incdir "/linux")))) '( - "a.out.h" ; for 2.2.5 "atalk.h" ; for 2.2.5 "errno.h" "falloc.h" From patchwork Fri Jun 21 12:26:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 14365 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 E866F1712C; Fri, 21 Jun 2019 13:29:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BEED117120 for ; Fri, 21 Jun 2019 13:29:43 +0100 (BST) Received: from localhost ([::1]:32886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIfn-0006ZJ-68 for patchwork@mira.cbaines.net; Fri, 21 Jun 2019 08:29:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35166) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIdH-0005IS-Bh for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heIdE-0005dc-11 for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1heIdC-0005ZB-De for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1heIdC-0006uG-8i for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36322] [PATCH 2/4] gnu: make-bootstrap: Restore cross-compilation workarounds. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2019 12:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36322 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36322@debbugs.gnu.org Received: via spool by 36322-submit@debbugs.gnu.org id=B36322.156112000326500 (code B ref 36322); Fri, 21 Jun 2019 12:27:02 +0000 Received: (at 36322) by debbugs.gnu.org; 21 Jun 2019 12:26:43 +0000 Received: from localhost ([127.0.0.1]:49872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcs-0006tM-LT for submit@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:42 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:33707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIco-0006sf-FF for 36322@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:39 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id D3783369 for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jun 2019 08:26:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=Sply92OhUBFQw NkbyTqsEv0UiwmKROgLFuMy9fCjeNo=; b=V+C7HgAx89xbTEUZTnwhE7l+O1UOZ YWhD36n7j9mu74TdN3V6BA9tHCybbenv3jHzZjOWGkPxd0zz/Kj2yCPGszHfrHho QBKrWgDXpwJZOxBFnoJwFYHuCbo1sw0BWWCCoYpJ+jrz+AcvrtHifHvfQsLXDO0h gShllxmMh/v/bvf6voQQ4asF20eARHyLfDV0piZHzIuSi+4pK/F04efibU5t7QLg uV3zODLVgyRgML0BZV9Lc/xi0AdRjbAGM8dy8z8UFxqDgShSGAFN8OVfX3IhIFzS yA2i4G+7BLsT9CbbyOhG7WTGmxF0T1UImFf8f7Ckn7jrZDp1BV2N35Qpw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=Sply92OhUBFQwNkbyTqsEv0UiwmKROgLFuMy9fCjeNo=; b=CtbTskuy ItF6nmA0TU+fLR0VuVj0pruVTf1J+XZJtklmj6oEJiAEd5bWgf+hzu+QpKjdxin4 kGjOY4Nqv7HjWd1w5zV3JOzMaHnOaNn6GQZvhW5Z2zJYh4opisDkNO8fmgwHnn4r 7rdka/UIOUeMtLrbJociiwEWIRcJzniTKrEwvZ3ib2zoh0Am1zqBUC1i2xKZbP7D 4wD0LnsgQ95o1eLb8pBO24QavpIFNxHOJ5AdaagFcytkp0d/P8n0Ig50fWEv9D16 wkTPtWdrxFAw1Zo4cjzvyzWyWIOWplZ010IIVIzxsRj+hhvZr/DbOayqqKCm8x87 wp7VuOakPEb/NA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrtdeigdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhnuhdrohhrghenucfkphepiedvrdduie drvddviedrudegtdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghs thhmrghilhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id D8246380074 for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:31 -0400 (EDT) From: Marius Bakke Date: Fri, 21 Jun 2019 14:26:26 +0200 Message-Id: <20190621122628.18174-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190621122628.18174-1-mbakke@fastmail.com> References: <20190621122628.18174-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 These workarounds were removed in cf8264364761857ca3550398369a0f20d7b0d512 and 218eb6e611c0a238802bf9cb5742d37cea0bb012, but were needed for %BOOTSTRAP-TARBALLS. * gnu/packages/make-bootstrap.scm (%static-inputs)[coreutils, tar]: Add <#:configure-flags>. --- gnu/packages/make-bootstrap.scm | 37 ++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index ec477da7c8..561a286d26 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -150,7 +150,15 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "--disable-silent-rules" "--enable-no-install-program=stdbuf,libstdbuf.so" "CFLAGS=-Os -g0" ; smaller, please - "LDFLAGS=-static -pthread") + "LDFLAGS=-static -pthread" + + ;; Work around a cross-compilation bug whereby libcoreutils.a + ;; would provide '__mktime_internal', which conflicts with the + ;; one in libc.a. + ,@(if (%current-target-system) + `("gl_cv_func_working_mktime=yes") + '())) + #:tests? #f ; signal-related Gnulib tests fail ,@(package-arguments coreutils))) @@ -213,17 +221,22 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." '())))) (tar (package (inherit tar) (arguments - (substitute-keyword-arguments (package-arguments tar) - ((#:phases phases) - `(modify-phases ,phases - (replace 'set-shell-file-name - (lambda _ - ;; Do not use "/bin/sh" to run programs; see - ;; . - (substitute* "src/system.c" - (("/bin/sh") "sh") - (("execv ") "execvp ")) - #t)))))))) + `(;; Work around a cross-compilation bug whereby libgnu.a would provide + ;; '__mktime_internal', which conflicts with the one in libc.a. + ,@(if (%current-target-system) + `(#:configure-flags '("gl_cv_func_working_mktime=yes")) + '()) + ,@(substitute-keyword-arguments (package-arguments tar) + ((#:phases phases) + `(modify-phases ,phases + (replace 'set-shell-file-name + (lambda _ + ;; Do not use "/bin/sh" to run programs; see + ;; . + (substitute* "src/system.c" + (("/bin/sh") "sh") + (("execv ") "execvp ")) + #t))))))))) ;; We don't want to retain a reference to /gnu/store in the bootstrap ;; versions of egrep/fgrep, so we remove the custom phase added since ;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in From patchwork Fri Jun 21 12:26:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 14364 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 352141712C; Fri, 21 Jun 2019 13:27:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8B23017120 for ; Fri, 21 Jun 2019 13:27:21 +0100 (BST) Received: from localhost ([::1]:60974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIdU-0005KO-JW for patchwork@mira.cbaines.net; Fri, 21 Jun 2019 08:27:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35169) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIdH-0005IV-Bi for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heIdE-0005e0-20 for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1heIdC-0005b1-TZ for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1heIdC-0006uO-Ol for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36322] [PATCH 3/4] gnu: make-bootstrap: Adjust for GCC 7. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2019 12:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36322 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36322@debbugs.gnu.org Received: via spool by 36322-submit@debbugs.gnu.org id=B36322.156112000526512 (code B ref 36322); Fri, 21 Jun 2019 12:27:02 +0000 Received: (at 36322) by debbugs.gnu.org; 21 Jun 2019 12:26:45 +0000 Received: from localhost ([127.0.0.1]:49874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcv-0006tX-0m for submit@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:45 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:60253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcq-0006sj-2I for 36322@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:42 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 8A49E35D for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:34 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jun 2019 08:26:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=4myvFwGsMVVbq zJPk7j8g84zXZy585Ssc9GRmAuZKGM=; b=gxCxZqs9Rr0QtqQXepwCTv6nnCt7b WQOrf6odBkpVfQvZi36lKWG0/1YFesB/ldSosCz5alm/glyt4Xkh2eevYK/29lkZ QsIdR2DHWI1gYsNAL6MfAsQQwq+vvr5+ZKNQPLOjqk86nsnnF8h5qDUOEnPdzqLm BTVrjL4qRiD/9jiKiZu8lyYzg2bTBSCWfqTat0tHJdJFTOUlsT66jPsUycRCL95/ 8ekq9U59RFdtTvwOmjrSKJqe7v3+8oiapuHZhqqX8RvqTwgbEe1T5Dt2uo43bRoM xR5BTL+WYQ2XB7DNgGuZHUDQtRFSMpO3dfAlYIxau0rST4aRsQ3DrkqAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=4myvFwGsMVVbqzJPk7j8g84zXZy585Ssc9GRmAuZKGM=; b=EaUc7cNP 1tNhqAEv4dqmnHh8hM44CvpnTuSRZtX+ImSUx3lLRsjg9S9U9oTKPbI8CRaMKRMo MBLcw4hX43rWJkizv5DVwawG06ZCT6cHooVTDeTOH/4Fpzlf66Q7rAzxKT2hglwA K+WUJ6vtjbPq/yBTYnMww/wm6o7gmbiOfEaoBXkUamUoSK74fHDTO2xLvrsbs0sU Iu3GcAsvu9W7ob2uiQ/BQDO/vfDF5oh7yEz8yh3cRapWirvkfk2tnR2lY8+KtMGJ vcMDpcASPkksz82iaVz9jyxw4pcG62E/VqmEaXIgPZr92XuCcOHx3CQQTuO0CWsa m2tMvekm5gQJGQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrtdeigdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucfkphepiedvrdduiedrvddviedrudegtdenucfrrghrrghmpe hmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtghomhenucevlhhushht vghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 88A17380087 for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:33 -0400 (EDT) From: Marius Bakke Date: Fri, 21 Jun 2019 14:26:27 +0200 Message-Id: <20190621122628.18174-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190621122628.18174-1-mbakke@fastmail.com> References: <20190621122628.18174-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/make-bootstrap.scm (package-with-relocatable-glibc)[native-inputs]: Add SEARCH-PATHS to CROSS-GCC, and NATIVE-SEARCH-PATHS to the native GCC. --- gnu/packages/make-bootstrap.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 561a286d26..df6b828a2d 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -106,16 +106,33 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define (native-inputs) (if (%current-target-system) - (let ((target (%current-target-system))) - `(("cross-gcc" ,(cross-gcc target - #:xbinutils (cross-binutils target) - #:libc (cross-bootstrap-libc))) + (let* ((target (%current-target-system)) + (xgcc (cross-gcc + target + #:xbinutils (cross-binutils target) + #:libc (cross-bootstrap-libc)))) + `(("cross-gcc" ,(package + (inherit xgcc) + (search-paths + ;; Ensure the cross libc headers appears on the + ;; C++ system header search path. + (cons (search-path-specification + (variable "CROSS_CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-search-paths gcc))))) ("cross-binutils" ,(cross-binutils target)) ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") ("gcc" ,(package (inherit gcc) (outputs '("out")) ;all in one so libgcc_s is easily found + (native-search-paths + ;; Set CPLUS_INCLUDE_PATH so GCC is able to find the libc + ;; C++ headers. + (cons (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-native-search-paths gcc))) (inputs `(;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap)) From patchwork Fri Jun 21 12:26:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 14363 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 1B69D1712E; Fri, 21 Jun 2019 13:27:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9191417124 for ; Fri, 21 Jun 2019 13:27:21 +0100 (BST) Received: from localhost ([::1]:60976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIdU-0005Kb-MF for patchwork@mira.cbaines.net; Fri, 21 Jun 2019 08:27:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35167) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIdH-0005IT-Bi for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heIdE-0005eA-2S for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36335) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1heIdD-0005c5-Di for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1heIdD-0006uV-8z for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36322] [PATCH 4/4] gnu: bootstrap-tarballs: Don't include the native mes when cross-compiling. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2019 12:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36322 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36322@debbugs.gnu.org Received: via spool by 36322-submit@debbugs.gnu.org id=B36322.156112000526519 (code B ref 36322); Fri, 21 Jun 2019 12:27:03 +0000 Received: (at 36322) by debbugs.gnu.org; 21 Jun 2019 12:26:45 +0000 Received: from localhost ([127.0.0.1]:49876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcv-0006tZ-Ae for submit@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:45 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:34459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcs-0006sn-1g for 36322@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:42 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 8A84E438 for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:36 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jun 2019 08:26:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=nhXUgjQJsHOeV 5i48MgPDTDHIF+QGkMPTeHtXP75PHo=; b=FAFLsCR9jYjuaGTuS7U5bAO8AxeP5 QgNcTAiodti0GKOdCcNA3FBsQgRY7LpNAIirU19WvsLyKC8GC8qpBC+aUA+Zxkge cnuGJWrrqML5ggD86PEEidKJFjEJRPaoXthuLJq2N8WNNLGlhqG214cfFJC4tMzZ PdgBP1rQNF0NApw6i1aABtB5Hd22wVZbkIXnXwaOYHavKNx37Q0G2TJcp3ubVyqx krTlIziH5ku4yOJ7d24XXZ1Q8beDLIAQDD3BkggRVdqz2i1oJlrr8K9cGn6wJuuh fFVs03+5QyqZJ1qGyrOaIVrvSbH/CgxUUWyLqywq1sx8ZmNkba3rK/R2w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=nhXUgjQJsHOeV5i48MgPDTDHIF+QGkMPTeHtXP75PHo=; b=NW3R1LqC l+5Z6AbJXFNo8REAfzMGVU/ozGRaQBpalpgKhD4Vu+I2iXp3vjEAda0rAfDUghZT PGl0G9sEOpnHw5/kabLmX9fDX/44C1rFRXy/kee9JeUAa39bs5iDtnVlNcKA3k67 EVuWKYuaqibx0VLRnj6e+pgx8EkAXvmUwYGLgDDnio/OjKxcixvWd82FmwegMZOJ JEYrFNX74VG1XXEgVnwuIf8ryHBseF5jk2p+6xOvw54JpsThuDN2W987PjISHlgV IPNvW3EMB3zo/T9EWV4SoLu/QNFBbInYtx40PGX897H7CNBunhAsGfVZosvNEQLP HfNct8L0KPZuOA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrtdeigdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucfkphepiedvrdduiedrvddviedrudegtdenucfrrghrrghmpe hmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtghomhenucevlhhushht vghrufhiiigvpedu X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 9FBAD380083 for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:35 -0400 (EDT) From: Marius Bakke Date: Fri, 21 Jun 2019 14:26:28 +0200 Message-Id: <20190621122628.18174-4-mbakke@fastmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190621122628.18174-1-mbakke@fastmail.com> References: <20190621122628.18174-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/make-bootstrap.scm (%bootstrap-tarballs)[inputs]: Check %CURRENT-TARGET-SYSTEM when deciding whether to use the reduced binary seeds. --- gnu/packages/make-bootstrap.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index df6b828a2d..2163b646f6 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -825,7 +825,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." %build-inputs) #t))) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball) - ,@(match (%current-system) + ,@(match (or (%current-target-system) (%current-system)) ((or "i686-linux" "x86_64-linux") `(("bootstrap-mescc-tools" ,%mescc-tools-bootstrap-tarball) ("bootstrap-mes" ,%mes-bootstrap-tarball)