[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/09: gnu: make-bootstrap: Restore cross-compilation workarounds.
From: |
guix-commits |
Subject: |
02/09: gnu: make-bootstrap: Restore cross-compilation workarounds. |
Date: |
Tue, 2 Jul 2019 12:17:41 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 7c836efacce165f79621fea8c2e3628cf8304f82
Author: Marius Bakke <address@hidden>
Date: Fri Jun 21 09:33:31 2019 +0200
gnu: make-bootstrap: Restore cross-compilation workarounds.
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 ec477da..561a286 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
- ;;
<http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
- (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
+ ;;
<http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
+ (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
- branch core-updates updated (8aaf42c -> 5f3f703), guix-commits, 2019/07/02
- 03/09: gnu: make-bootstrap: Adjust for GCC 7., guix-commits, 2019/07/02
- 04/09: gnu: bootstrap-tarballs: Don't include the native Mes when cross-compiling., guix-commits, 2019/07/02
- 08/09: gnu: linux-libre-headers: Update to 4.19.56., guix-commits, 2019/07/02
- 07/09: gnu: commencement: Remove outdated comment., guix-commits, 2019/07/02
- 05/09: gnu: gettext: Update to 0.20.1., guix-commits, 2019/07/02
- 06/09: gnu: libuninameslist: Update to 20190701., guix-commits, 2019/07/02
- 02/09: gnu: make-bootstrap: Restore cross-compilation workarounds.,
guix-commits <=
- 09/09: gnu: glibc: Update to 2.29., guix-commits, 2019/07/02
- 01/09: gnu: make-bootstrap: Remove obsolete header file., guix-commits, 2019/07/02