diff --git a/config.sh b/config.sh index bd5bd0ad..abbed1d1 100644 --- a/config.sh +++ b/config.sh @@ -219,13 +219,11 @@ function build_gdal { CXXFLAGS="$CXXFLAGS -DPROJ_RENAME_SYMBOLS -DPROJ_INTERNAL_CPP_NAMESPACE -g -O2" EXPAT_PREFIX=$BUILD_PREFIX - #if [ -n "$IS_OSX" ]; then - # GEOS_CONFIG="-DGDAL_USE_GEOS=OFF" - #else - # GEOS_CONFIG="-DGDAL_USE_GEOS=ON" - #fi - EXPAT_PREFIX=$BUILD_PREFIX - GEOS_CONFIG="--with-geos=${BUILD_PREFIX}/bin/geos-config" + if [ -n "$IS_OSX" ]; then + GEOS_CONFIG="-DGDAL_USE_GEOS=OFF" + else + GEOS_CONFIG="-DGDAL_USE_GEOS=ON" + fi local cmake=cmake fetch_unpack http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION}.tar.gz @@ -360,7 +358,10 @@ function build_wheel_cmd { pip download GDAL==${GDAL_VERSION} tar xzvf GDAL-${GDAL_VERSION}.tar.gz cd GDAL-${GDAL_VERSION} - GDAL_VERSION=$GDAL_VERSION $cmd $wheelhouse + echo "sleep" + sleep 3600 + if [ "$(uname -m)" = "arm64" ]; GDAL_VERSION=$GDAL_VERSION ARCHFLAGS="-arch arm64" $cmd $wheelhouse --compile --no-cache-dir + GDAL_VERSION=$GDAL_VERSION ARCHFLAGS="-arch amd64" $cmd $wheelhouse --compile --no-cache-dir fi if [ "$REPO_DIR" == "pyproj" ]; then pwd diff --git a/multibuild/osx_utils.sh b/multibuild/osx_utils.sh index 8eddc2fd..754289e7 100644 --- a/multibuild/osx_utils.sh +++ b/multibuild/osx_utils.sh @@ -115,7 +115,7 @@ function macpython_sdk_list_for_version { local _return if [ "$(uname -m)" = "arm64" ]; then - _return="11.0" + _return="13.0" elif [ "$_major" -eq "2" ]; then [ $(lex_ver $_ver) -lt $(lex_ver 2.7.18) ] && _return="10.6" [ $(lex_ver $_ver) -ge $(lex_ver 2.7.15) ] && _return="$_return 10.9"