Repository: parquet-cpp Updated Branches: refs/heads/master f97042d9b -> 7b92d7a20
PARQUET-653: Build conda artifacts with -static-libstdc++ again The final stage of this work will be to move dev/testing packaging builds to centos6 images on Circle CI (this may be possible in Travis -- which allows you to use docker -- but easier with Circle CI) Author: Wes McKinney <[email protected]> Closes #133 from wesm/PARQUET-653 and squashes the following commits: 80e6010 [Wes McKinney] Build conda artifacts with -static-libstdc++ again Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/7b92d7a2 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/7b92d7a2 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/7b92d7a2 Branch: refs/heads/master Commit: 7b92d7a20cf42ca481cbe8d6de546ebfba459c6d Parents: f97042d Author: Wes McKinney <[email protected]> Authored: Wed Jul 6 15:04:52 2016 -0700 Committer: Wes McKinney <[email protected]> Committed: Wed Jul 6 15:04:52 2016 -0700 ---------------------------------------------------------------------- conda.recipe/build.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7b92d7a2/conda.recipe/build.sh ---------------------------------------------------------------------- diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh index 7a5f471..2dcc626 100644 --- a/conda.recipe/build.sh +++ b/conda.recipe/build.sh @@ -52,13 +52,11 @@ export PARQUET_INSECURE_CURL=1 source thirdparty/versions.sh export GTEST_HOME=`pwd`/thirdparty/$GTEST_BASEDIR -# PARQUET-638, PARQUET-489: This should be restored after symbol visibility is -# hidden by default -# if [ `uname` == Linux ]; then -# SHARED_LINKER_FLAGS='-static-libstdc++' -# elif [ `uname` == Darwin ]; then -# SHARED_LINKER_FLAGS='' -# fi +if [ `uname` == Linux ]; then + SHARED_LINKER_FLAGS='-static-libstdc++' +elif [ `uname` == Darwin ]; then + SHARED_LINKER_FLAGS='' +fi cmake \ -DCMAKE_BUILD_TYPE=release \
