[PATCH] gnu: icu4c: Patch zoneinfo directory.

Open

Details

3 participants

Leo Famulari
Ludovic Courtès
Christopher Baines

Owner: unassigned

Submitted by: Christopher Baines

Severity: normal

Christopher Baines wrote on 17 May 2018 14:58

Recipients:(address . guix-patches@gnu.org)

Message-ID:20180517125834.7417-1-mail@cbaines.net

Replace the hardcoded /usr/share/zoneinfo file with a reference to the tzdata

package.

* gnu/packages/icu4c.scm (icu4c)[inputs]: Add tzdata.

[arguments]: Add a patch-zoneinfo-directory phase.

---

gnu/packages/icu4c.scm | 12 ++++++++++--

1 file changed, 10 insertions(+), 2 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 57e8fffb3..d34b61745 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -22,6 +22,7 @@
 
 (define-module (gnu packages icu4c)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages perl)
   #:use-module (guix licenses)
   #:use-module (guix packages)
@@ -45,7 +46,8 @@
              (base32 "065l3n0q9wqaw8dz20x82srshhm6i987fr9ync5xf9mr6n7ylwzh"))))
    (build-system gnu-build-system)
    (inputs
-    `(("perl" ,perl)))
+    `(("perl" ,perl)
+      ("tzdata" ,tzdata)))
    (arguments
     `(#:configure-flags
       '("--enable-rpath"
@@ -58,7 +60,13 @@
       #:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'chdir-to-source
-          (lambda _ (chdir "source") #t)))))
+          (lambda _ (chdir "source") #t))
+        (add-after 'chdir-to-source 'patch-zoneinfo-directory
+          (lambda* (#:key inputs #:allow-other-keys)
+            (substitute* "common/putil.cpp"
+              (("\\/usr\\/share\\/zoneinfo")
+               (string-append (assoc-ref inputs "tzdata")
+                              "/share/zoneinfo"))))))))
    (synopsis "International Components for Unicode")
    (description
     "ICU is a set of C/C++ and Java libraries providing Unicode and
-- 
2.16.3

Ludovic Courtès wrote on 19 May 2018 22:21

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)

Message-ID:878t8fpfah.fsf@gnu.org

Hello,

Christopher Baines <mail@cbaines.net> skribis:

Toggle quote (6 lines)

> Replace the hardcoded /usr/share/zoneinfo file with a reference to the tzdata

> package.

> * gnu/packages/icu4c.scm (icu4c)[inputs]: Add tzdata.

> [arguments]: Add a patch-zoneinfo-directory phase.

Good catch.

I wonder if icu4c should instead depend on ‘tzdata-for-tests’, which is

changed less frequently to avoid full rebuilds? Maybe Leo can comment.

I hope icu4c also honors the TZDIR environment variable, which would

allow users to have it refer to the latest version. Do you know if

that’s the case?

Last thing: this would probably be for ‘core-updates-next’.

Thanks,

Ludo’.

Leo Famulari wrote on 21 May 2018 19:15

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:20180521171514.GA13182@jasmine.lan

On Sat, May 19, 2018 at 10:21:42PM +0200, Ludovic Courtès wrote:

Toggle quote (10 lines)> Hello,
> 
> Christopher Baines <mail@cbaines.net> skribis:
> 
> > Replace the hardcoded /usr/share/zoneinfo file with a reference to the tzdata
> > package.
> >
> > * gnu/packages/icu4c.scm (icu4c)[inputs]: Add tzdata.
> > [arguments]: Add a patch-zoneinfo-directory phase.

Thanks for noticing this, Chris.

Toggle quote (3 lines)

> I wonder if icu4c should instead depend on ‘tzdata-for-tests’, which is

> changed less frequently to avoid full rebuilds? Maybe Leo can comment.

tzdata-for-tests is meant to be used by packages that don't need current

time zone info. Thus, "for test suites only". We added tzdata-for-tests

to make it cheaper to update tzdata.

If icu4c needs current time zone info, it should not use

tzdata-for-tests. Chris, can you give more context about how icu4c uses

time zone information?

Toggle quote (4 lines)

> I hope icu4c also honors the TZDIR environment variable, which would

> allow users to have it refer to the latest version. Do you know if

> that’s the case?

Yeah, it would be great if icu4c could just use TZDIR, which would allow

us to continue updating the time zones relatively frequently... if icu4c

actually needs the time zone database.

Already, we have problems keeping them up to date because too many

packages depend on them, and that's a problem for Guix users (clocks

will be wrong in some time zones). If we let icu4c depend on tzdata,

then we will only be able to update the time zones during core-updates,

which is not frequent enough. Currently, we can at least update tzdata

on 'staging' braches.

It indicates two general problems, IMO:

1) the lack of build farm capacity

2) it should be possible to update the time zone database without

rebuilding packages (the packages should use TZDIR)

I wonder what is done in Nixpkgs...

Ludovic Courtès wrote on 22 May 2018 14:06

Recipients:(name . Leo Famulari)(address . leo@famulari.name)

Message-ID:878t8b6giq.fsf@gnu.org

Heya,

Leo Famulari <leo@famulari.name> skribis:

Toggle quote (6 lines)

> It indicates two general problems, IMO:

> 1) the lack of build farm capacity

> 2) it should be possible to update the time zone database without

> rebuilding packages (the packages should use TZDIR)

I think tzdata is an example where dynamic composition (i.e., TZDIR) is

what we should use. That way we can update tzdata as frequently as we

want.

For the case where TZDIR is unset, programs can still use

tzdata-for-tests, which could be slightly outdated, but I consider it a

“degraded” mode and I think it’s fine.

Toggle quote (2 lines)

> I wonder what is done in Nixpkgs...

It may be that the majority of their users don’t live in the regions

affected by recent timezone changes…

Ludo’.

Leo Famulari wrote on 24 May 2018 18:30

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:20180524163058.GB11853@jasmine.lan

On Tue, May 22, 2018 at 02:06:53PM +0200, Ludovic Courtès wrote:

Toggle quote (4 lines)

> For the case where TZDIR is unset, programs can still use

> tzdata-for-tests, which could be slightly outdated, but I consider it a

> “degraded” mode and I think it’s fine.

Okay, I'll rename it tzdata-old in core-updates to better describe the

full range of use cases.

Toggle quote (5 lines)

> > I wonder what is done in Nixpkgs...

> It may be that the majority of their users don’t live in the regions

> affected by recent timezone changes…

Yes, and these last minute changes tend not to affect the wealthier

parts of the world, where such problems would have a greater impact.

Christopher Baines wrote on 11 Jun 2018 20:18

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:871sdd426h.fsf@cbaines.net

Ludovic Courtès <ludo@gnu.org> writes:

Toggle quote (19 lines)> Hello,
>
> Christopher Baines <mail@cbaines.net> skribis:
>
>> Replace the hardcoded /usr/share/zoneinfo file with a reference to the tzdata
>> package.
>>
>> * gnu/packages/icu4c.scm (icu4c)[inputs]: Add tzdata.
>> [arguments]: Add a patch-zoneinfo-directory phase.
>
> Good catch.
>
> I wonder if icu4c should instead depend on ‘tzdata-for-tests’, which is
> changed less frequently to avoid full rebuilds?  Maybe Leo can comment.
>
> I hope icu4c also honors the TZDIR environment variable, which would
> allow users to have it refer to the latest version.  Do you know if
> that’s the case?

All I remember about this was that I don't think it fixed the problem I
was trying to solve :) I had the patch in a stash for a while before
submitting it.

I don't even know what icu4c actually does, so I'm not very well placed
to look at this further, but I'm glad you and Leo seem to be getting
something from it :)

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 31484@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date