mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 22:53:42 +00:00
10f8f08267
* Fix varmod-localtime test by setting TZ to an absolute path to the appropriate file in TZDIR. This avoids having an extra patch for musl which doesn't support TZDIR at all. * Move tests into checkPhase by applying patch from alpine * Fix build with musl by disabling deptgt-delete_on_error test (which I haven't debugged myself, just copied this from alpine) and fixing a test which fails due to differing output from strerror(3) between musl and glibc. Also we need to add a shebang to install-sh, otherwise it won't be executed in pkgsMusl.
24 lines
983 B
Diff
24 lines
983 B
Diff
--- bmake/unit-tests/Makefile.orig 2021-05-30 14:24:38.822484317 +0200
|
|
+++ bmake/unit-tests/Makefile 2021-05-31 13:25:21.645751428 +0200
|
|
@@ -455,7 +455,8 @@
|
|
ENV.varmisc= FROM_ENV=env
|
|
ENV.varmisc+= FROM_ENV_BEFORE=env
|
|
ENV.varmisc+= FROM_ENV_AFTER=env
|
|
-ENV.varmod-localtime+= TZ=Europe/Berlin
|
|
+# Set absolute path to tz file since musl doesn't support TZDIR
|
|
+ENV.varmod-localtime+= TZDIR=${TZDIR} TZ=:${TZDIR}/Europe/Berlin
|
|
ENV.varname-vpath+= VPATH=varname-vpath.dir:varname-vpath.dir2
|
|
|
|
# Override make flags for some of the tests; default is -k.
|
|
--- bmake/unit-tests/varmod-localtime.mk.orig 2021-05-30 14:30:34.397986246 +0200
|
|
+++ bmake/unit-tests/varmod-localtime.mk 2021-05-31 13:24:41.430906606 +0200
|
|
@@ -3,7 +3,7 @@
|
|
# Tests for the :localtime variable modifier, which formats a timestamp
|
|
# using strftime(3) in local time.
|
|
|
|
-.if ${TZ} != "Europe/Berlin" # see unit-tests/Makefile
|
|
+.if ${TZ} != ":${TZDIR}/Europe/Berlin" # see unit-tests/Makefile
|
|
. error
|
|
.endif
|
|
|