diff options
| author | glewis <glewis@FreeBSD.org> | 2014-07-21 03:33:08 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2014-07-21 03:33:08 +0800 |
| commit | d46491b659e99fbb716d15e3cac2caf8c4d1b317 (patch) | |
| tree | 5699826c44ce10a406f07a9cc81aecf1772fcd2c /java | |
| parent | 67f52fb21aedd50b363a51b77841bde39df1712c (diff) | |
| download | freebsd-ports-gnome-d46491b659e99fbb716d15e3cac2caf8c4d1b317.tar.gz freebsd-ports-gnome-d46491b659e99fbb716d15e3cac2caf8c4d1b317.tar.zst freebsd-ports-gnome-d46491b659e99fbb716d15e3cac2caf8c4d1b317.zip | |
. Don't hardcode /bin/bash. Fixes build trace output.
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk8/files/patch-make-common-MakeBase.gmk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/java/openjdk8/files/patch-make-common-MakeBase.gmk b/java/openjdk8/files/patch-make-common-MakeBase.gmk new file mode 100644 index 000000000000..1781510d5d7b --- /dev/null +++ b/java/openjdk8/files/patch-make-common-MakeBase.gmk @@ -0,0 +1,11 @@ +--- make/common/MakeBase.gmk.orig 2014-07-05 17:17:35.000000000 -0700 ++++ make/common/MakeBase.gmk 2014-07-05 17:17:51.000000000 -0700 +@@ -338,7 +338,7 @@ + # (and causing a crash on Cygwin). + # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. + # Only use time if it's GNU time which supports format and output file. +- WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash ++ WRAPPER_SHELL:=bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log bash + SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL) + endif + # Never remove warning messages; this is just for completeness |