From owner-svn-ports-head@FreeBSD.ORG Sun Jul 20 19:33:09 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1335B7E1; Sun, 20 Jul 2014 19:33:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 005FD2410; Sun, 20 Jul 2014 19:33:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6KJX8Qg029264; Sun, 20 Jul 2014 19:33:08 GMT (envelope-from glewis@svn.freebsd.org) Received: (from glewis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6KJX8Ut029263; Sun, 20 Jul 2014 19:33:08 GMT (envelope-from glewis@svn.freebsd.org) Message-Id: <201407201933.s6KJX8Ut029263@svn.freebsd.org> From: Greg Lewis Date: Sun, 20 Jul 2014 19:33:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362358 - head/java/openjdk8/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jul 2014 19:33:09 -0000 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