Merge pull request #125071 from sternenseemann/bmake
bmake: 20200902 -> 20210420launchpad/nixpkgs/master
commit
4542b54abd
@ -0,0 +1,23 @@ |
||||
--- 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
|
||||
|
@ -1,13 +1,13 @@ |
||||
--- bmake/unit-tests/unexport-env.mk.orig 2019-02-19 10:24:14.356713136 -0800
|
||||
+++ bmake/unit-tests/unexport-env.mk 2019-02-19 10:25:43.838775388 -0800
|
||||
@@ -3,8 +3,8 @@
|
||||
# pick up a bunch of exported vars
|
||||
--- bmake/unit-tests/unexport-env.mk.orig 2021-05-27 14:44:45.263392298 +0200
|
||||
+++ bmake/unit-tests/unexport-env.mk 2021-05-27 14:46:46.188881996 +0200
|
||||
@@ -4,8 +4,8 @@
|
||||
FILTER_CMD= grep ^UT_
|
||||
.include "export.mk"
|
||||
|
||||
-# an example of setting up a minimal environment.
|
||||
-PATH = /bin:/usr/bin:/sbin:/usr/sbin
|
||||
-PATH= /bin:/usr/bin:/sbin:/usr/sbin
|
||||
+# preserve PATH so commands used in the "all" target are still available
|
||||
+PATH := ${PATH}
|
||||
+PATH := ${PATH}
|
||||
|
||||
# now clobber the environment to just PATH and UT_TEST
|
||||
UT_TEST = unexport-env
|
||||
UT_TEST= unexport-env
|
||||
|
Loading…
Reference in new issue