guix-commits
[Top][All Lists]
Advanced

[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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]