diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-10-12 14:01:56 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 10:31:29 -0500 |
| commit | 8c801194b548d1f2d6f47dfcdd5611ae72e29759 (patch) | |
| tree | 3dea583181ce733a3269886cad0965d5d8c792ab /gnu | |
| parent | 24e5cf51847e50c7735e0090614093b799c0e30f (diff) | |
gnu: glibc: Look for the current timezone in /etc/localtime.
Fixes <https://issues.guix.gnu.org/50830>.
Reported by podiki on #guix.
Previously, glibc 2.33 would look for
/gnu/store/...-glibc-2.33/etc/localtime instead of /etc/localtime.
* gnu/packages/base.scm (glibc)[arguments]: Remove #:make-flags.
[phases]: In 'pre-configure', modify 'inet/Makefile' instead of
'sunrpc/Makefile' since this is where these bits are in 2.33.
(glibc-2.31)[arguments]: Add 'set-etc-rpc-installation-directory'
phase.
(glibc-2.30): Inherit from GLIBC-2.31.
* gnu/tests/base.scm (run-basic-test)["libc honors /etc/localtime"]: New
test.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 25 | ||||
| -rw-r--r-- | gnu/tests/base.scm | 11 |
2 files changed, 27 insertions, 9 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9c45f524dc..68f238a2fe 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -775,11 +775,6 @@ the store.") '("--disable-werror") '())) - ;; Arrange so that /etc/rpc & co. go to $out/etc. - #:make-flags (list (string-append "sysconfdir=" - (assoc-ref %outputs "out") - "/etc")) - #:tests? #f ; XXX #:phases (modify-phases %standard-phases (add-before @@ -793,8 +788,7 @@ the store.") (bash (or (assoc-ref inputs "static-bash") (assoc-ref native-inputs "static-bash")))) ;; Install the rpc data base file under `$out/etc/rpc'. - ;; FIXME: Use installFlags = [ "sysconfdir=$(out)/etc" ]; - (substitute* "sunrpc/Makefile" + (substitute* "inet/Makefile" (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) (string-append out "/etc/rpc" suffix "\n")) (("^install-others =.*$") @@ -950,11 +944,24 @@ with the Linux kernel.") "glibc-2.31-hurd-clock_gettime_monotonic.patch" "glibc-hurd-signal-sa-siginfo.patch" "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))))) + "glibc-hurd-gettyent.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments glibc) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'set-etc-rpc-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; Install the rpc data base file under `$out/etc/rpc'. + (let ((out (assoc-ref outputs "out"))) + (substitute* "sunrpc/Makefile" + (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) + (string-append out "/etc/rpc" suffix "\n")) + (("^install-others =.*$") + (string-append "install-others = " out "/etc/rpc\n")))))))))))) (define-public glibc-2.30 (package - (inherit glibc) + (inherit glibc-2.31) (version "2.30") (native-inputs ;; This fails with a build error in libc-tls.c when using GCC 10. Use an diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 9198a3e267..38d4317e52 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -87,6 +87,7 @@ Otherwise assume that there is no password for root." (use-modules (gnu build marionette) (guix build syscalls) (srfi srfi-1) + (srfi srfi-19) (srfi srfi-26) (srfi srfi-64) (ice-9 match)) @@ -196,6 +197,16 @@ info --version") (pk 'services services) '(root #$@(operating-system-shepherd-service-names os))))) + (test-equal "libc honors /etc/localtime" + -7200 ;CEST = GMT+2 + ;; Assume OS is configured to have a CEST timezone. + (let* ((sept-2021 (time-second + (date->time-utc + (make-date 0 0 00 12 01 09 2021 7200))))) + (marionette-eval + `(tm:gmtoff (localtime ,sept-2021)) + marionette))) + (test-equal "/var/log/messages is not world-readable" #o640 ;<https://bugs.gnu.org/40405> (begin |