guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: tzdata: Keep using the "fat" tzdata file format.


From: guix-commits
Subject: 01/02: gnu: tzdata: Keep using the "fat" tzdata file format.
Date: Sat, 7 Nov 2020 14:12:00 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit fce5ce77d0eb74692ea1ee0082c0abe628690770
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Nov 7 20:09:54 2020 +0100

    gnu: tzdata: Keep using the "fat" tzdata file format.
    
    * gnu/packages/base.scm (tzdata)[arguments]: In #:make-flags, pass CPPFLAGS 
to
    preserve the same on-disk format as earlier releases.
---
 gnu/packages/base.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e8f7bb5..1e3f0f1 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1240,7 +1240,7 @@ command.")
                "02g88pbw82zr36x9dz5ib4sq6bfq253yx5hbhnfyhp143naky1cv"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f
+     `(#:tests? #f
        #:make-flags (let ((out (assoc-ref %outputs "out"))
                           (tmp (getenv "TMPDIR")))
                       (list (string-append "TOPDIR=" out)
@@ -1252,6 +1252,16 @@ command.")
                             (string-append "LIBDIR=" tmp "/lib")
                             (string-append "MANDIR=" tmp "/man")
 
+                            ;; XXX: tzdata 2020b changed the on-disk format
+                            ;; of the time zone files from 'fat' to 'slim'.
+                            ;; Many packages (particularly 
evolution-data-server)
+                            ;; can not yet handle the latter, so we stick with
+                            ;; 'fat' for now.
+                            ,@(if (version>=? (package-version this-package)
+                                              "2020b")
+                                  '("CPPFLAGS=-DZIC_BLOAT_DEFAULT='\"fat\"'")
+                                  '())
+
                             "AWK=awk"
                             "CC=gcc"))
        #:modules ((guix build utils)



reply via email to

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