-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bmake: fix version/url, fix tests, remove unneeded deps
As noted by @jameysharp in #63181. Signed-off-by: Austin Seipp <[email protected]>
- Loading branch information
Austin Seipp
committed
Jun 16, 2019
1 parent
486626b
commit ccee411
Showing
3 changed files
with
31 additions
and
17 deletions.
There are no files selected for viewing
10 changes: 10 additions & 0 deletions
10
pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |