Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Nov 2015 09:27:33 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401919 - head/devel/hadoop2
Message-ID:  <201511190927.tAJ9RXrP081291@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Thu Nov 19 09:27:33 2015
New Revision: 401919
URL: https://svnweb.freebsd.org/changeset/ports/401919

Log:
  Pass JAVA_HOME to MAKE_ENV to ensure maven picks the correct version of
  Java when compiling sources.

Modified:
  head/devel/hadoop2/Makefile

Modified: head/devel/hadoop2/Makefile
==============================================================================
--- head/devel/hadoop2/Makefile	Thu Nov 19 09:25:04 2015	(r401918)
+++ head/devel/hadoop2/Makefile	Thu Nov 19 09:27:33 2015	(r401919)
@@ -39,7 +39,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.7
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
-MAKE_ENV+=	HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc
+MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} HADOOP_PROTOC_PATH=${LOCALBASE}/protobuf25/bin/protoc
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFAULT=	EXAMPLES



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511190927.tAJ9RXrP081291>