From 5e89cd918fb383dce1c40a48b7b2371f938bc92a Mon Sep 17 00:00:00 2001 From: Paul Watkins Date: Thu, 16 Aug 2018 13:20:41 +0200 Subject: [PATCH] going back to libCZI fork --- .gitmodules | 3 --- libCZI | 1 - travis/build-wheels.sh | 12 ++++++++---- 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 160000 libCZI diff --git a/.gitmodules b/.gitmodules index 8228ddc0..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "libCZI"] - path = libCZI - url = https://github.com/zeiss-microscopy/libCZI.git diff --git a/libCZI b/libCZI deleted file mode 160000 index 0922f1b1..00000000 --- a/libCZI +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0922f1b13582680b2c9801415f7368d17e8b360b diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 61b80a38..24ae7b12 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -5,12 +5,16 @@ set -e -x yum install -y libpng-devel zlib-devel # Install newer devtools that work on manylinux -GCCLOC=https://github.com/squeaky-pl/centos-devtools/releases/download/6.3 -GCCAR=gcc-6.3.0-binutils-2.27-x86_64.tar.bz2 -curl -o ${GCCAR} -L ${GCCLOC}/${GCCAR} -tar xvjf ${GCCAR} +#GCCLOC=https://github.com/squeaky-pl/centos-devtools/releases/download/6.3 +#GCCAR=gcc-6.3.0-binutils-2.27-x86_64.tar.bz2 +#export CC=/opt/devtools-6.3/bin/gcc +#export CXX=/opt/devtools-6.3/bin/g++ +GCCLOC=https://github.com/Noctem/pogeo-toolchain/releases/download/v1.5 +GCCAR=gcc-7.3-centos5-x86-64.tar.bz2 export CC=/toolchain/bin/gcc export CXX=/toolchain/bin/g++ +curl -o ${GCCAR} -L ${GCCLOC}/${GCCAR} +tar xvjf ${GCCAR} # Compile wheels for PYBIN in /opt/python/*/bin; do