parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-635: Use conda-forge toolchain, statically link libstdc++ on Linux
Date Tue, 21 Jun 2016 20:31:48 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master aac1f2aa4 -> f334a8b97


PARQUET-635: Use conda-forge toolchain, statically link libstdc++ on Linux

This will avoid portability issues across different Linux environments.

Author: Wes McKinney <wesm@apache.org>

Closes #123 from wesm/PARQUET-635 and squashes the following commits:

63039a1 [Wes McKinney] Use conda-forge toolchain, statically link libstdc++


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/f334a8b9
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/f334a8b9
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/f334a8b9

Branch: refs/heads/master
Commit: f334a8b97cd2499799cc74262a52191d04692773
Parents: aac1f2a
Author: Wes McKinney <wesm@apache.org>
Authored: Tue Jun 21 13:31:42 2016 -0700
Committer: Wes McKinney <wesm@apache.org>
Committed: Tue Jun 21 13:31:42 2016 -0700

----------------------------------------------------------------------
 conda.recipe/build.sh  | 28 +++++++++++++++-------------
 conda.recipe/meta.yaml |  1 +
 2 files changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/f334a8b9/conda.recipe/build.sh
----------------------------------------------------------------------
diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
index cf64ba7..cadf512 100644
--- a/conda.recipe/build.sh
+++ b/conda.recipe/build.sh
@@ -3,6 +3,14 @@
 set -e
 set -x
 
+# FIXME: This is a hack to make sure the environment is activated.
+# The reason this is required is due to the conda-build issue
+# mentioned below.
+#
+# https://github.com/conda/conda-build/issues/910
+#
+source activate "${CONDA_DEFAULT_ENV}"
+
 cd $RECIPE_DIR
 
 # Build dependencies
@@ -12,19 +20,6 @@ export SNAPPY_HOME=$PREFIX
 export THRIFT_HOME=$PREFIX
 export ZLIB_HOME=$PREFIX
 
-if [ "$(uname)" == "Darwin" ]; then
-  # C++11 finagling for Mac OSX
-  export CC=clang
-  export CXX=clang++
-  export MACOSX_VERSION_MIN="10.7"
-  CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
-  CXXFLAGS="${CXXFLAGS} -stdlib=libc++ -std=c++11"
-  export LDFLAGS="${LDFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
-  export LDFLAGS="${LDFLAGS} -stdlib=libc++ -std=c++11"
-  export LINKFLAGS="${LDFLAGS}"
-  export MACOSX_DEPLOYMENT_TARGET=10.7
-fi
-
 cd ..
 
 rm -rf conda-build
@@ -50,9 +45,16 @@ export PARQUET_INSECURE_CURL=1
 source thirdparty/versions.sh
 export GTEST_HOME=`pwd`/thirdparty/$GTEST_BASEDIR
 
+if [ `uname` == Linux ]; then
+    SHARED_LINKER_FLAGS='-static-libstdc++'
+elif [ `uname` == Darwin ]; then
+    SHARED_LINKER_FLAGS=''
+fi
+
 cmake \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
+    -DCMAKE_SHARED_LINKER_FLAGS=$SHARED_LINKER_FLAGS \
     -DPARQUET_BUILD_BENCHMARKS=off \
     ..
 

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/f334a8b9/conda.recipe/meta.yaml
----------------------------------------------------------------------
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 81aa949..888f946 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -12,6 +12,7 @@ build:
 
 requirements:
   build:
+    - toolchain
     - boost
     - cmake
     - zlib


Mime
View raw message