[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/22: tzdata: Don't bother with cross-compiling.
From: |
guix-commits |
Subject: |
07/22: tzdata: Don't bother with cross-compiling. |
Date: |
Wed, 14 Jul 2021 13:20:49 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit a997640db92cdbe05ba7680381d4226beffbf1ca
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Jul 14 13:12:52 2021 +0200
tzdata: Don't bother with cross-compiling.
The time zone database is architecture-independent,
so trying to cross-compile it is pointless!
* gnu/packages/base.scm
(tzdata)[arguments]<#:target>: Set to #f.
(tzdata)[allowed-references]: Only include the "out" output itself,
to make sure no (architecture-dependent) binaries are installed.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/base.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 9c1c946..b7864f6 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2020 Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com>
;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1254,6 +1255,14 @@ command.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f
+ ;; This consists purely of (architecture-independent) data,
+ ;; so ‘cross-compilation’ is pointless here!
+ ;; (The binaries zic, dump, and tzselect are deleted in the post-install
+ ;; phase.)
+ #:target #f
+ ;; share/zoneinfo/posix is a symlink to share/zoneinfo,
+ ;; so include the package itself in #:allowed-references.
+ #:allowed-references ("out")
#:make-flags (let ((out (assoc-ref %outputs "out"))
(tmp (getenv "TMPDIR")))
(list (string-append "TOPDIR=" out)
- branch core-updates updated (b4ccf3d -> 8456581), guix-commits, 2021/07/14
- 07/22: tzdata: Don't bother with cross-compiling.,
guix-commits <=
- 09/22: libgpg-error: Prevent silent miscompilation some systems., guix-commits, 2021/07/14
- 05/22: packages: Define this-package-input and this-package-native-input., guix-commits, 2021/07/14
- 02/22: utils: Define 'target-hurd?' predicate., guix-commits, 2021/07/14
- 06/22: net-base: Don't cross-compile., guix-commits, 2021/07/14
- 14/22: openssl: Use G-exp machinery for referring to outputs., guix-commits, 2021/07/14
- 20/22: glib: Look up "tzdata" in 'native-inputs', not 'inputs'., guix-commits, 2021/07/14
- 21/22: libelf: Update configure script and config.guess and config.sub., guix-commits, 2021/07/14
- 15/22: openssl: Move documentation instead of copying and deleting it., guix-commits, 2021/07/14
- 19/22: glib: Verify the cross-compiled python is used in installed scripts., guix-commits, 2021/07/14
- 16/22: openssl: Move all man pages to separate output, not only man3., guix-commits, 2021/07/14