kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject incubator-kudu git commit: Add thirdparty common prefix to include paths
Date Fri, 15 Jan 2016 07:04:48 GMT
Repository: incubator-kudu
Updated Branches:
  refs/heads/master 43bdbdcde -> 6f0a51bae


Add thirdparty common prefix to include paths

A few of the thirdparty dependencies rely on libunwind, which is
installed into the thirdparty common prefix.

Change-Id: I520b19d1753d0f7cde6c25cb072d11830b4dd23e
Reviewed-on: http://gerrit.cloudera.org:8080/1780
Reviewed-by: Adar Dembo <adar@cloudera.com>
Tested-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/6f0a51ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/6f0a51ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/6f0a51ba

Branch: refs/heads/master
Commit: 6f0a51bae1ba75169757869607e2243acce29d48
Parents: 43bdbdc
Author: Dan Burkert <dan@cloudera.com>
Authored: Wed Jan 13 15:23:46 2016 -0800
Committer: Todd Lipcon <todd@apache.org>
Committed: Fri Jan 15 07:02:04 2016 +0000

----------------------------------------------------------------------
 thirdparty/build-definitions.sh | 5 ++---
 thirdparty/build-thirdparty.sh  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/6f0a51ba/thirdparty/build-definitions.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index 636e73a..7945ae7 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -111,7 +111,7 @@ build_gflags() {
   cd $GFLAGS_DIR
   CFLAGS="$EXTRA_CFLAGS" \
     CXXFLAGS="$EXTRA_CXXFLAGS" \
-    LDFLAGS="-L$PREFIX/lib $EXTRA_LDFLAGS" \
+    LDFLAGS="$EXTRA_LDFLAGS" \
     LIBS="$EXTRA_LIBS" \
     ./configure --with-pic --prefix=$PREFIX
   make -j$PARALLEL install
@@ -128,8 +128,7 @@ build_libunwind() {
 build_glog() {
   cd $GLOG_DIR
   CXXFLAGS="$EXTRA_CXXFLAGS" \
-    LDFLAGS="-L$PREFIX/lib $EXTRA_LDFLAGS" \
-    CPPFLAGS="-I$PREFIX/include" \
+    LDFLAGS="$EXTRA_LDFLAGS" \
     LIBS="$EXTRA_LIBS" \
     ./configure --with-pic --prefix=$PREFIX --with-gflags=$PREFIX
   make -j$PARALLEL install

http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/6f0a51ba/thirdparty/build-thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 2ff69ba..ebff539 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -59,8 +59,8 @@ done
 # We also enable -fno-omit-frame-pointer so that profiling tools which
 # use frame-pointer based stack unwinding can function correctly.
 EXTRA_CFLAGS="$CFLAGS $EXTRA_CFLAGS -fno-omit-frame-pointer"
-EXTRA_CXXFLAGS="$CXXFLAGS $EXTRA_CXXFLAGS -fno-omit-frame-pointer -O2"
-EXTRA_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+EXTRA_CXXFLAGS="$CXXFLAGS $EXTRA_CXXFLAGS -I${PREFIX_COMMON}/include -fno-omit-frame-pointer
-O2"
+EXTRA_LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS -L${PREFIX_COMMON}/lib"
 EXTRA_LIBS="$LIBS $EXTRA_LIBS"
 
 if [[ "$OSTYPE" =~ ^linux ]]; then


Mime
View raw message