From 69e8c1ed8a69d6e74f646ad786646818ef3de019 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 23 Oct 2020 14:05:32 -0500 Subject: [PATCH 1/2] Use imath-32 in wheels --- wheels/config.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/wheels/config.sh b/wheels/config.sh index 8669242..b364972 100644 --- a/wheels/config.sh +++ b/wheels/config.sh @@ -38,17 +38,13 @@ function pre_build { export ABI=32 fi echo "Bundled dependencies in the wheel" >> doc/misc.rst - build_simple2 gmp 6.1.2 https://gmplib.org/download/gmp tar.bz2 \ - --enable-shared --disable-static --with-pic --enable-fat - pushd gmp-6.1.2 - cat README >> ../doc/misc.rst - cat COPYING.LESSERv3 >> ../doc/misc.rst - echo "" >> ../doc/misc.rst - popd build_simple2 isl 0.22.1 http://isl.gforge.inria.fr tar.gz \ - --enable-shared --disable-static --with-int=gmp --with-gmp-prefix=$BUILD_PREFIX + --enable-shared --disable-static --with-int=imath-32 pushd isl-0.22.1 cat LICENSE >> ../doc/misc.rst + echo "imath license" >> doc/misc.rst + echo "=============" >> doc/misc.rst + head -n 25 imath/imath.h >> ../doc/mis.rst popd } From c89ad4bf25128419636a3567433ea131281bb5da Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 6 Nov 2020 13:54:42 -0600 Subject: [PATCH 2/2] use bundled isl --- wheels/config.sh | 50 ++++++------------------------------------------ 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/wheels/config.sh b/wheels/config.sh index b364972..32cbcf2 100644 --- a/wheels/config.sh +++ b/wheels/config.sh @@ -1,50 +1,12 @@ -function build_simple2 { - local name=$1 - local version=$2 - local url=$3 - local ext=$4 - shift 4 - if [ -e "${name}-stamp" ]; then - return - fi - local name_version="${name}-${version}" - local targz=${name_version}.$ext - fetch_unpack $url/$targz - (cd $name_version \ - && ((./configure --prefix=$BUILD_PREFIX $*) || (cat config.log && exit 1)) \ - && make \ - && make install) - touch "${name}-stamp" - echo "${name} is bundled with this wheel" >> doc/misc.rst - echo "Source code can be found at: $url/$targz" >> doc/misc.rst - echo "${name} license" >> doc/misc.rst - echo "===================" >> doc/misc.rst -} - function pre_build { set -x - export PATH=$PATH:$BUILD_PREFIX/bin - if [ -n "$IS_OSX" ]; then - export CC="clang" - export CXX="clang++" - export CFLAGS="-arch x86_64" - export CXXFLAGS="-arch x86_64" - export LDFLAGS="-arch x86_64" - export MACOSX_DEPLOYMENT_TARGET="10.9" - export ABI=64 - elif [[ "$PLAT" == "x86_64" ]]; then - export ABI=64 - elif [[ "$PLAT" == "i686" ]]; then - export ABI=32 - fi - echo "Bundled dependencies in the wheel" >> doc/misc.rst - build_simple2 isl 0.22.1 http://isl.gforge.inria.fr tar.gz \ - --enable-shared --disable-static --with-int=imath-32 - pushd isl-0.22.1 + + pushd isl + echo "isl license" >> ../doc/misc.rst cat LICENSE >> ../doc/misc.rst - echo "imath license" >> doc/misc.rst - echo "=============" >> doc/misc.rst - head -n 25 imath/imath.h >> ../doc/mis.rst + echo "imath license" >> ../doc/misc.rst + echo "=============" >> ../doc/misc.rst + head -n 25 imath/imath.h >> ../doc/misc.rst popd }