You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2016/03/25 20:46:20 UTC
[2/2] incubator-kudu git commit: thirdparty: respect BOOST_ROOT
environment variable for preflight
thirdparty: respect BOOST_ROOT environment variable for preflight
Change-Id: I13a1d068533538ba6406621d7ccc823b15f83dd4
Reviewed-on: http://gerrit.cloudera.org:8080/2629
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/1ad79bcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/1ad79bcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/1ad79bcc
Branch: refs/heads/master
Commit: 1ad79bccd6a59c99e23cfe6dd58ae488a5cf5e55
Parents: 96b7291
Author: Todd Lipcon <to...@apache.org>
Authored: Fri Mar 25 02:34:36 2016 -0700
Committer: Todd Lipcon <to...@apache.org>
Committed: Fri Mar 25 19:45:55 2016 +0000
----------------------------------------------------------------------
thirdparty/preflight.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/1ad79bcc/thirdparty/preflight.py
----------------------------------------------------------------------
diff --git a/thirdparty/preflight.py b/thirdparty/preflight.py
index 3e00dd2..cd15f72 100755
--- a/thirdparty/preflight.py
+++ b/thirdparty/preflight.py
@@ -110,6 +110,9 @@ def check_cxx11():
def check_boost():
+ flags = ['-E']
+ if 'BOOST_ROOT' in os.environ:
+ flags += ['-I%s/include' % os.environ['BOOST_ROOT']]
try_do(
"Checking for boost_thread and boost_system headers",
("Unable to compile a simple program that uses boost. " +
@@ -118,7 +121,7 @@ def check_boost():
#include <boost/thread/locks.hpp>
#include <boost/system/config.hpp>
""",
- flags=["-E"]))
+ flags=flags))
def check_sasl():