Reinstate C++14 toolchain

Looks like that toolchain does not provide g++, but does provide c++ and is capable of building when the missing CXX=c++ is supplied. So it should work now and build us a c++14 version for manylinux1, unless it doesn't.

1 files changed, 13 insertions, 3 deletions

diff --git a/.travis.yml b/.travis.yml
index bcc0059..7bb777d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,16 @@ matrix:
     env: 
       - MATRIX_EVAL="GCC=4.8"  # defer setting CC to gcc- etc until before_install
 
+  - os: linux
+    sudo: required
+    python: "3.6"  # test other versions here
+    addons:
+      apt:
+        sources: [ubuntu-toolchain-r-test]
+        packages: [g++-7]  # g++-7 supports c++14
+    env: 
+      - MATRIX_EVAL="GCC=7"  # defer setting CC to gcc- etc until before_install
+
   - os: osx
     osx_image: xcode8.3
     language: generic
@@ -26,7 +36,7 @@ matrix:
   - stage: wheels
     os: osx
     osx_image: xcode8.3
-    language: cpp
+    language: cpp  # osx + language: python is broken
     install:
     - brew install qpdf
     script:
@@ -49,13 +59,13 @@ matrix:
     install:
       - pip install pybind11
       - pip install cibuildwheel  # https://github.com/jbarlow83/cibuildwheel/archive/master.zip
-      #- mkdir gcc-x86_64 && wget -q https://github.com/Noctem/pogeo-toolchain/releases/download/v1.4/gcc-7.2-binutils-2.29-centos5-x86-64.tar.bz2 -O - | tar xj -C gcc-x86_64 --strip-components=1
+      - mkdir gcc-x86_64 && wget -q https://github.com/Noctem/pogeo-toolchain/releases/download/v1.4/gcc-7.2-binutils-2.29-centos5-x86-64.tar.bz2 -O - | tar xj -C gcc-x86_64 --strip-components=1
       #- mkdir ccache && wget -q https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.bz2 -O - | tar xj -C ccache --strip-components=1
       - mkdir qpdf && wget -q https://github.com/qpdf/qpdf/archive/release-qpdf-7.0.0.tar.gz -O - | tar xz -C qpdf --strip-components=1
     script:
       #- export CIBW_ENVIRONMENT='ARCH=x86_64 PATH="`pwd`/gcc-$ARCH/bin:$PATH" CC="ccache cc" CXX="ccache c++" CXXFLAGS="-static-libstdc++" LD_LIBRARY_PATH="`pwd`/gcc-$ARCH/lib" CCACHE_BASEDIR=`python -c "import tempfile; import os; print(os.path.realpath(tempfile.gettempdir()))"` CCACHE_DIR=/host'$HOME'/.ccache'
       #- export CIBW_BEFORE_BUILD='{pip} install pybind11 && [ -d ccache/$ARCH ] || (unset CC CXX CXXFLAGS && mkdir ccache/$ARCH && cd ccache/$ARCH && ../configure && make install)'
-      #- export CIBW_ENVIRONMENT='ARCH=x86_64 PATH="`pwd`/gcc-$ARCH/bin:$PATH" CXXFLAGS="-static-libstdc++" LD_LIBRARY_PATH="`pwd`/gcc-$ARCH/lib"'
+      - export CIBW_ENVIRONMENT='ARCH=x86_64 PATH="`pwd`/gcc-$ARCH/bin:$PATH" CC="cc" CXX="c++" CXXFLAGS="-static-libstdc++" LD_LIBRARY_PATH="`pwd`/gcc-$ARCH/lib:$LD_LIBRARY_PATH"'
       - export CIBW_BEFORE_BUILD='yum install -y libjpeg-devel zlib-devel && cd qpdf && ./autogen.sh && ./configure && make install && cd .. && {pip} install pybind11'
       - export CIBW_SKIP="cp27-* cp33-* cp34-* *i686"
       - cibuildwheel