ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glibc: Look for the current timezone in /etc/localtime.

Browse source 
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>
This commit is contained in:
Ludovic Courtès 2021-10-12 14:01:56 -04:00 committed by Maxim Cournoyer
parent 24e5cf5184
commit 8c801194b5
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/base.scm
View file

@ -775,11 +775,6 @@ (define-public glibc
'("--disable-werror") '("--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 #:tests? #f ; XXX
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before (add-before
@ -793,8 +788,7 @@ (define-public glibc
(bash (or (assoc-ref inputs "static-bash") (bash (or (assoc-ref inputs "static-bash")
(assoc-ref native-inputs "static-bash")))) (assoc-ref native-inputs "static-bash"))))
;; Install the rpc data base file under `$out/etc/rpc'. ;; Install the rpc data base file under `$out/etc/rpc'.
;; FIXME: Use installFlags = [ "sysconfdir=$(out)/etc" ]; (substitute* "inet/Makefile"
(substitute* "sunrpc/Makefile"
(("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
(string-append out "/etc/rpc" suffix "\n")) (string-append out "/etc/rpc" suffix "\n"))
(("^install-others =.*$") (("^install-others =.*$")
@ -950,11 +944,24 @@ (define-public glibc-2.31
"glibc-2.31-hurd-clock_gettime_monotonic.patch" "glibc-2.31-hurd-clock_gettime_monotonic.patch"
"glibc-hurd-signal-sa-siginfo.patch" "glibc-hurd-signal-sa-siginfo.patch"
"glibc-hurd-mach-print.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 (define-public glibc-2.30
(package (package
(inherit glibc) (inherit glibc-2.31)
(version "2.30") (version "2.30")
(native-inputs (native-inputs
;; This fails with a build error in libc-tls.c when using GCC 10. Use an ;; This fails with a build error in libc-tls.c when using GCC 10. Use an

11
gnu/tests/base.scm
View file

@ -87,6 +87,7 @@ (define test
(use-modules (gnu build marionette) (use-modules (gnu build marionette)
(guix build syscalls) (guix build syscalls)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-19)
(srfi srfi-26) (srfi srfi-26)
(srfi srfi-64) (srfi srfi-64)
(ice-9 match)) (ice-9 match))
@ -196,6 +197,16 @@ (define marionette
(pk 'services services) (pk 'services services)
'(root #$@(operating-system-shepherd-service-names os))))) '(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" (test-equal "/var/log/messages is not world-readable"
#o640 ;<https://bugs.gnu.org/40405> #o640 ;<https://bugs.gnu.org/40405>
(begin (begin