Date: Sun, 20 Jul 2014 19:33:08 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362358 - head/java/openjdk8/files Message-ID: <201407201933.s6KJX8Ut029263@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Jul 20 19:33:08 2014 New Revision: 362358 URL: http://svnweb.freebsd.org/changeset/ports/362358 QAT: https://qat.redports.org/buildarchive/r362358/ Log: . Don't hardcode /bin/bash. Fixes build trace output. Added: head/java/openjdk8/files/patch-make-common-MakeBase.gmk (contents, props changed) Added: head/java/openjdk8/files/patch-make-common-MakeBase.gmk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-make-common-MakeBase.gmk Sun Jul 20 19:33:08 2014 (r362358) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407201933.s6KJX8Ut029263>