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