bmake: fix version/url, fix tests, remove unneeded deps
As noted by @jameysharp in #63181. Signed-off-by: Austin Seipp <as@fastly.com>
This commit is contained in:
parent
486626bd70
commit
ccee4117be
@ -0,0 +1,10 @@
|
||||
--- bmake/make-bootstrap.sh.in.orig 2019-02-19 10:55:21.733606117 -0800
|
||||
+++ bmake/make-bootstrap.sh.in 2019-02-19 10:56:02.150771541 -0800
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
srcdir=@srcdir@
|
||||
|
||||
+prefix="@prefix@"
|
||||
DEFAULT_SYS_PATH="@default_sys_path@"
|
||||
|
||||
case "@use_meta@" in
|
@ -1,31 +1,22 @@
|
||||
{ stdenv, fetchurl
|
||||
, gnugrep, coreutils, getopt
|
||||
, getopt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bmake-${version}";
|
||||
version = "20121212";
|
||||
version = "20181221";
|
||||
|
||||
src = fetchurl {
|
||||
# really wish this URL was versioned. if this changes for some
|
||||
# update in the future, we'll have to backport those updates to
|
||||
# any stable branches so builds can continue to work. :(
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/bmake.tar.gz";
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz";
|
||||
sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ gnugrep coreutils getopt
|
||||
];
|
||||
nativeBuildInputs = [ getopt ];
|
||||
|
||||
# unexport-env sets PATH to a bogus value that won't be
|
||||
# possible to use inside the build sandbox. nuke that test;
|
||||
# we could also re-construct the PATH variable a bit based on
|
||||
# nativeBuildInputs, but not for now
|
||||
patchPhase = ''
|
||||
substituteInPlace ./unit-tests/Makefile.in \
|
||||
--replace "unexport-env" ""
|
||||
'';
|
||||
patches = [
|
||||
./bootstrap-fix.patch
|
||||
./fix-unexport-env-test.patch
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Portable version of NetBSD 'make'";
|
||||
|
@ -0,0 +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
|
||||
.include "export.mk"
|
||||
|
||||
-# an example of setting up a minimal environment.
|
||||
-PATH = /bin:/usr/bin:/sbin:/usr/sbin
|
||||
+# preserve PATH so commands used in the "all" target are still available
|
||||
+PATH := ${PATH}
|
||||
|
||||
# now clobber the environment to just PATH and UT_TEST
|
||||
UT_TEST = unexport-env
|
Loading…
Reference in New Issue
Block a user