You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by we...@apache.org on 2016/07/09 15:59:39 UTC
parquet-cpp git commit: PARQUET-656: Revert attempts to make conda
artifacts portable
Repository: parquet-cpp
Updated Branches:
refs/heads/master ec78dd86e -> cce6e2d66
PARQUET-656: Revert attempts to make conda artifacts portable
The toolchain issue is not tractable on an ad hoc basis. I suggest we use a consistent gcc toolchain across the CI environments for Parquet and Arrow, and we can post dev builds for human consumption / testing via conda-forge (where the RHEL devtoolset is there and already working well). Sound good @xhochy?
see also https://github.com/conda-forge/staged-recipes/pull/992
Author: Wes McKinney <we...@apache.org>
Closes #134 from wesm/PARQUET-656 and squashes the following commits:
97af015 [Wes McKinney] Revert attempts to make conda artifacts portable
Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/cce6e2d6
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/cce6e2d6
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/cce6e2d6
Branch: refs/heads/master
Commit: cce6e2d66b458f073bb1cb4e6918e00696e6e42a
Parents: ec78dd8
Author: Wes McKinney <we...@apache.org>
Authored: Sat Jul 9 08:59:30 2016 -0700
Committer: Wes McKinney <we...@apache.org>
Committed: Sat Jul 9 08:59:30 2016 -0700
----------------------------------------------------------------------
conda.recipe/build.sh | 32 +++++++++++---------------------
conda.recipe/meta.yaml | 1 -
2 files changed, 11 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/cce6e2d6/conda.recipe/build.sh
----------------------------------------------------------------------
diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
index 2dcc626..2e7b1c6 100644
--- a/conda.recipe/build.sh
+++ b/conda.recipe/build.sh
@@ -3,21 +3,19 @@
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}"
-
-# Force the use of gcc 4.9 on Linux (was reset by conda-forge toolchain)
-if [ `uname` == Linux ]; then
- export CC="gcc-4.9"
- export CXX="g++-4.9"
+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 $RECIPE_DIR
# Build dependencies
@@ -46,22 +44,14 @@ pwd
export PARQUET_INSECURE_CURL=1
./thirdparty/download_thirdparty.sh
-
./thirdparty/build_thirdparty.sh gtest
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/cce6e2d6/conda.recipe/meta.yaml
----------------------------------------------------------------------
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 888f946..81aa949 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -12,7 +12,6 @@ build:
requirements:
build:
- - toolchain
- boost
- cmake
- zlib