[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/20: tzdata: Don't bother with cross-compiling.
From: |
guix-commits |
Subject: |
05/20: tzdata: Don't bother with cross-compiling. |
Date: |
Mon, 12 Jul 2021 11:15:41 -0400 (EDT) |
mothacehe pushed a commit to branch wip-meson
in repository guix.
commit a6c471171607b55f156a1a68fa1633a39192a717
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sun Jul 11 13:47:08 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 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 9c1c946..92f6505 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,13 @@ 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)
- 10/20: openssl: Remove trailing #t from phases., (continued)
- 10/20: openssl: Remove trailing #t from phases., guix-commits, 2021/07/12
- 17/20: glib: Verify the cross-compiled python is used in installed scripts., guix-commits, 2021/07/12
- 15/20: openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., guix-commits, 2021/07/12
- 07/20: libgpg-error: Prevent silent miscompilation some systems., guix-commits, 2021/07/12
- 09/20: python: Fix reference to input when cross-compiling., guix-commits, 2021/07/12
- 13/20: openssl: Move documentation instead of copying and deleting it., guix-commits, 2021/07/12
- 14/20: openssl: Move all man pages to separate output, not only man3., guix-commits, 2021/07/12
- 01/20: utils: Define target-linux? predicate., guix-commits, 2021/07/12
- 12/20: openssl: Use G-exp machinery for referring to outputs., guix-commits, 2021/07/12
- 03/20: packages: Define this-package-input and this-package-native-input., guix-commits, 2021/07/12
- 05/20: tzdata: Don't bother with cross-compiling.,
guix-commits <=
- 19/20: libelf: Update configure script and config.guess and config.sub., guix-commits, 2021/07/12