bmake: 20200902 -> 20210420
* 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.
This commit is contained in:
parent
5a3e710e36
commit
10f8f08267
|
@ -1,21 +1,45 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, getopt
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, getopt, tzdata
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bmake";
|
||||
version = "20200902";
|
||||
version = "20210420";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
|
||||
sha256 = "1v1v81llsiy8qbpy38nml1x08dhrihwh040pqgwbwb9zy1108b08";
|
||||
sha256 = "1ajq8v5rq3pl5y9h1hlscs83007fsyk3lhcp87z09ma370lm3ra7";
|
||||
};
|
||||
|
||||
# Make tests work with musl
|
||||
# * Disable deptgt-delete_on_error test (alpine does this too)
|
||||
# * Fix test failing due to different strerror(3) output for musl and glibc
|
||||
postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
|
||||
sed -i unit-tests/Makefile -e '/deptgt-delete_on_error/d'
|
||||
substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ getopt ];
|
||||
|
||||
patches = [
|
||||
# make bootstrap script aware of the prefix in /nix/store
|
||||
./bootstrap-fix.patch
|
||||
# preserve PATH from build env in unit tests
|
||||
./fix-unexport-env-test.patch
|
||||
# Fix localtime tests without global /etc/zoneinfo directory
|
||||
./fix-localtime-test.patch
|
||||
# decouple tests from build phase
|
||||
(fetchpatch {
|
||||
name = "separate-tests.patch";
|
||||
url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch";
|
||||
sha256 = "00s76jwyr83c6rkvq67b1lxs8jhm0gj2rjgy77xazqr5400slj9a";
|
||||
})
|
||||
# add a shebang to bmake's install(1) replacement
|
||||
(fetchpatch {
|
||||
name = "install-sh.patch";
|
||||
url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch";
|
||||
sha256 = "0z8icd6akb96r4cksqnhynkn591vbxlmrrs4w6wil3r6ggk6mwa6";
|
||||
})
|
||||
];
|
||||
|
||||
# The generated makefile is a small wrapper for calling ./boot-strap
|
||||
|
@ -43,6 +67,16 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ tzdata ];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
./boot-strap -o . op=test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -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,7 +1,7 @@
|
|||
--- 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.
|
||||
|
|
Loading…
Reference in a new issue