Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D8397200B13 for ; Wed, 1 Jun 2016 03:32:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D533A160A48; Wed, 1 Jun 2016 01:32:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 28ABA160A44 for ; Wed, 1 Jun 2016 03:32:13 +0200 (CEST) Received: (qmail 44679 invoked by uid 500); 1 Jun 2016 01:32:12 -0000 Mailing-List: contact commits-help@yetus.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@yetus.apache.org Delivered-To: mailing list commits@yetus.apache.org Received: (qmail 44670 invoked by uid 99); 1 Jun 2016 01:32:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 01:32:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 367A1DFB74; Wed, 1 Jun 2016 01:32:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sekikn@apache.org To: commits@yetus.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: yetus git commit: YETUS-403. hadoop personality needs better handling of homebrew Date: Wed, 1 Jun 2016 01:32:12 +0000 (UTC) archived-at: Wed, 01 Jun 2016 01:32:14 -0000 Repository: yetus Updated Branches: refs/heads/master 3d983b367 -> ef0e1c058 YETUS-403. hadoop personality needs better handling of homebrew Signed-off-by: Allen Wittenauer Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/ef0e1c05 Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/ef0e1c05 Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/ef0e1c05 Branch: refs/heads/master Commit: ef0e1c0583e38958a782293015c63210305062ec Parents: 3d983b3 Author: Kengo Seki Authored: Tue May 31 09:49:42 2016 +0900 Committer: Kengo Seki Committed: Wed Jun 1 01:31:36 2016 +0000 ---------------------------------------------------------------------- precommit/personality/hadoop.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/ef0e1c05/precommit/personality/hadoop.sh ---------------------------------------------------------------------- diff --git a/precommit/personality/hadoop.sh b/precommit/personality/hadoop.sh index 2bbfd0e..c86a9df 100755 --- a/precommit/personality/hadoop.sh +++ b/precommit/personality/hadoop.sh @@ -35,6 +35,11 @@ function personality_globals GITHUB_REPO="apache/hadoop" #shellcheck disable=SC2034 PYLINT_OPTIONS="--indent-string=' '" + + HADOOP_HOMEBREW_DIR=${HADOOP_HOMEBREW_DIR:-$(brew --prefix 2>/dev/null)} + if [[ -z "${HADOOP_HOMEBREW_DIR}" ]]; then + HADOOP_HOMEBREW_DIR=/usr/local + fi } ## @description Calculate the actual module ordering @@ -136,16 +141,16 @@ function hadoop_native_flags -Drequire.test.libhadoop ;; Darwin) - JANSSON_INCLUDE_DIR=/usr/local/opt/jansson/include - JANSSON_LIBRARY=/usr/local/opt/jansson/lib + JANSSON_INCLUDE_DIR="${HADOOP_HOMEBREW_DIR}/opt/jansson/include" + JANSSON_LIBRARY="${HADOOP_HOMEBREW_DIR}/opt/jansson/lib" export JANSSON_LIBRARY JANSSON_INCLUDE_DIR # shellcheck disable=SC2086 echo \ -Pnative -Drequire.snappy \ -Drequire.openssl \ - -Dopenssl.prefix=/usr/local/opt/openssl/ \ - -Dopenssl.include=/usr/local/opt/openssl/include \ - -Dopenssl.lib=/usr/local/opt/openssl/lib \ + -Dopenssl.prefix=${HADOOP_HOMEBREW_DIR}/opt/openssl/ \ + -Dopenssl.include=${HADOOP_HOMEBREW_DIR}/opt/openssl/include \ + -Dopenssl.lib=${HADOOP_HOMEBREW_DIR}/opt/openssl/lib \ -Drequire.libwebhdfs -Drequire.test.libhadoop ;; *)