Skip to content
This repository was archived by the owner on May 10, 2024. It is now read-only.

Commit cce6e2d

Browse files
committed
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 conda-forge/staged-recipes#992 Author: Wes McKinney <[email protected]> Closes #134 from wesm/PARQUET-656 and squashes the following commits: 97af015 [Wes McKinney] Revert attempts to make conda artifacts portable
1 parent ec78dd8 commit cce6e2d

2 files changed

Lines changed: 11 additions & 22 deletions

File tree

conda.recipe/build.sh

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@
33
set -e
44
set -x
55

6-
# FIXME: This is a hack to make sure the environment is activated.
7-
# The reason this is required is due to the conda-build issue
8-
# mentioned below.
9-
#
10-
# https://github.com/conda/conda-build/issues/910
11-
#
12-
source activate "${CONDA_DEFAULT_ENV}"
13-
14-
# Force the use of gcc 4.9 on Linux (was reset by conda-forge toolchain)
15-
if [ `uname` == Linux ]; then
16-
export CC="gcc-4.9"
17-
export CXX="g++-4.9"
6+
if [ "$(uname)" == "Darwin" ]; then
7+
# C++11 finagling for Mac OSX
8+
export CC=clang
9+
export CXX=clang++
10+
export MACOSX_VERSION_MIN="10.7"
11+
CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
12+
CXXFLAGS="${CXXFLAGS} -stdlib=libc++ -std=c++11"
13+
export LDFLAGS="${LDFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
14+
export LDFLAGS="${LDFLAGS} -stdlib=libc++ -std=c++11"
15+
export LINKFLAGS="${LDFLAGS}"
16+
export MACOSX_DEPLOYMENT_TARGET=10.7
1817
fi
1918

20-
2119
cd $RECIPE_DIR
2220

2321
# Build dependencies
@@ -46,22 +44,14 @@ pwd
4644
export PARQUET_INSECURE_CURL=1
4745

4846
./thirdparty/download_thirdparty.sh
49-
5047
./thirdparty/build_thirdparty.sh gtest
5148

5249
source thirdparty/versions.sh
5350
export GTEST_HOME=`pwd`/thirdparty/$GTEST_BASEDIR
5451

55-
if [ `uname` == Linux ]; then
56-
SHARED_LINKER_FLAGS='-static-libstdc++'
57-
elif [ `uname` == Darwin ]; then
58-
SHARED_LINKER_FLAGS=''
59-
fi
60-
6152
cmake \
6253
-DCMAKE_BUILD_TYPE=release \
6354
-DCMAKE_INSTALL_PREFIX=$PREFIX \
64-
-DCMAKE_SHARED_LINKER_FLAGS=$SHARED_LINKER_FLAGS \
6555
-DPARQUET_BUILD_BENCHMARKS=off \
6656
..
6757

conda.recipe/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ build:
1212

1313
requirements:
1414
build:
15-
- toolchain
1615
- boost
1716
- cmake
1817
- zlib

0 commit comments

Comments
 (0)