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-640: Ensure that gcc 4.9 is used in conda builds
Date Fri, 24 Jun 2016 01:13:04 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master dc436c476 -> c6a3d270d


PARQUET-640: Ensure that gcc 4.9 is used in conda builds

The toolchain change in https://github.com/apache/parquet-cpp/commit/f334a8b97cd2499799cc74262a52191d04692773
saved a bunch of OS X boilerplate but caused the artifacts to get built with gcc 4.8 by accident.

Author: Wes McKinney <wesm@apache.org>

Closes #125 from wesm/PARQUET-640 and squashes the following commits:

a05f38d [Wes McKinney] Ensure that gcc 4.9 is used in conda builds


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

Branch: refs/heads/master
Commit: c6a3d270d130b45326f2dd8fa7ab0272b2fc9434
Parents: dc436c4
Author: Wes McKinney <wesm@apache.org>
Authored: Thu Jun 23 18:12:57 2016 -0700
Committer: Wes McKinney <wesm@apache.org>
Committed: Thu Jun 23 18:12:57 2016 -0700

----------------------------------------------------------------------
 conda.recipe/build.sh | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/c6a3d270/conda.recipe/build.sh
----------------------------------------------------------------------
diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
index 2ba5c77..7a5f471 100644
--- a/conda.recipe/build.sh
+++ b/conda.recipe/build.sh
@@ -11,6 +11,13 @@ set -x
 #
 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"
+fi
+
+
 cd $RECIPE_DIR
 
 # Build dependencies


Mime
View raw message