* Add presets for SciPy 1.3.2 (issue #747)

bytedeco · Nov 20, 2019 · 4d374b5 · 4d374b5
1 parent 2d8e579
commit 4d374b5
Show file tree

Hide file tree

Showing 19 changed files with 940 additions and 26 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,7 +22,7 @@ environment:
       OS: windows-x86
     - PROJ: "arpack-ng,cminpack,fftw,gsl"
       OS: windows-x86
-    - PROJ: "cpython,numpy"
+    - PROJ: "cpython,numpy,scipy"
       OS: windows-x86
     - PROJ: "llvm"
       OS: windows-x86
@@ -51,7 +51,7 @@ environment:
       OS: windows-x86_64
     - PROJ: "arpack-ng,cminpack,fftw,gsl"
       OS: windows-x86_64
-    - PROJ: "cpython,numpy"
+    - PROJ: "cpython,numpy,scipy"
       OS: windows-x86_64
     - PROJ: "llvm"
       OS: windows-x86_64

diff --git a/.travis.yml b/.travis.yml
@@ -185,7 +185,7 @@ matrix:
         install: true
         script: ./ci/install-travis.sh
       - os: linux
-        env: PROJ=cpython,numpy OS=linux-armhf
+        env: PROJ=cpython,numpy,scipy OS=linux-armhf
         install: true
         script: ./ci/install-travis.sh
       - os: linux
@@ -226,7 +226,7 @@ matrix:
         install: true
         script: ./ci/install-arm.sh
       - os: linux
-        env: PROJ=cpython,numpy OS=linux-arm64
+        env: PROJ=cpython,numpy,scipy OS=linux-arm64
         install: true
         script: ./ci/install-arm.sh
       - os: linux
@@ -267,7 +267,7 @@ matrix:
         install: true
         script: ./ci/install-ppc.sh
       - os: linux
-        env: PROJ=cpython,numpy OS=linux-ppc64le
+        env: PROJ=cpython,numpy,scipy OS=linux-ppc64le
         install: true
         script: ./ci/install-ppc.sh
       - os: linux
@@ -316,7 +316,7 @@ matrix:
         install: true
         script: ./ci/install-travis.sh
       - os: linux
-        env: PROJ=cpython,numpy OS=linux-x86
+        env: PROJ=cpython,numpy,scipy OS=linux-x86
         install: true
         script: ./ci/install-travis.sh
       - os: linux
@@ -389,7 +389,7 @@ matrix:
         install: true
         script: ./ci/install-travis.sh
       - os: linux
-        env: PROJ=cpython,numpy OS=linux-x86_64
+        env: PROJ=cpython,numpy,scipy OS=linux-x86_64
         install: true
         script: ./ci/install-travis.sh
       - os: linux
@@ -499,7 +499,7 @@ matrix:
         script: ./ci/install-travis.sh
       - os: osx
         osx_image: xcode9.3
-        env: PROJ=cpython,numpy OS=macosx-x86_64
+        env: PROJ=cpython,numpy,scipy OS=macosx-x86_64
         install: true
         script: ./ci/install-travis.sh
       - os: osx

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Add presets for SciPy 1.3.2 ([issue #747](https://github.com/bytedeco/javacpp-presets/issues/747))
  * Upgrade presets for NumPy 1.17.4, ONNX Runtime 1.0.0, Qt 5.13.2
 
 ### November 5, 2019 version 1.5.2

diff --git a/README.md b/README.md
@@ -130,6 +130,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * GSL 2.6  http://www.gnu.org/software/gsl/#downloading
  * CPython 3.7.5  https://www.python.org/downloads/
  * NumPy 1.17.x  https://github.com/numpy/numpy
+ * SciPy 1.3.x  https://github.com/scipy/scipy
  * LLVM 9.0.0  http://llvm.org/releases/download.html
  * libpostal 1.1-alpha  https://github.com/openvenues/libpostal
  * Leptonica 1.78.0  http://www.leptonica.org/download.html

diff --git a/ci/install-travis.sh b/ci/install-travis.sh
@@ -206,7 +206,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
    # Try to use ccache to speed up the build
    export PATH=/usr/local/opt/ccache/libexec/:/usr/local/opt/gpg1/libexec/gpgbin/:$PATH
 
-   if [[ "$PROJ" =~ arpack-ng ]] || [[ "$PROJ" =~ cminpack ]] || [[ "$PROJ" =~ mkl-dnn ]] || [[ "$PROJ" =~ openblas ]]; then
+   if [[ "$PROJ" =~ arpack-ng ]] || [[ "$PROJ" =~ cminpack ]] || [[ "$PROJ" =~ mkl-dnn ]] || [[ "$PROJ" =~ openblas ]] || [[ "$PROJ" =~ scipy ]]; then
        brew install gcc@7
        brew link --overwrite gcc@7
 

diff --git a/cppbuild.sh b/cppbuild.sh
@@ -98,28 +98,28 @@ case $PLATFORM in
     android-arm)
         export ANDROID_BIN="$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/$KERNEL-$ARCH/"
         export ANDROID_ROOT="$ANDROID_NDK/platforms/android-21/arch-arm/"
-        export ANDROID_FLAGS="--gcc-toolchain=$ANDROID_BIN --sysroot=$ANDROID_ROOT -isystem $ANDROID_CPP/include/ -isystem $ANDROID_CPP/../llvm-libc++abi/include/ -isystem $ANDROID_NDK/sources/android/support/include/ -isystem $ANDROID_CPP/libs/armeabi-v7a/include/ -isystem $ANDROID_NDK/sysroot/usr/include/ -isystem $ANDROID_NDK/sysroot/usr/include/arm-linux-androideabi/ -isystem $ANDROID_ROOT/usr/include/ -isystem $ANDROID_NDK/sources/android/cpufeatures/ -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target armv7-none-linux-androideabi -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -z text -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-ignored-optimization-argument -Wl,--fix-cortex-a8 -L$ANDROID_CPP/libs/armeabi-v7a/ -L$ANDROID_ROOT/usr/lib/ -Wl,--no-undefined -static-libstdc++"
+        export ANDROID_FLAGS="--gcc-toolchain=$ANDROID_BIN --sysroot=$ANDROID_ROOT -isystem $ANDROID_CPP/include/ -isystem $ANDROID_CPP/../llvm-libc++abi/include/ -isystem $ANDROID_NDK/sources/android/support/include/ -isystem $ANDROID_CPP/libs/armeabi-v7a/include/ -isystem $ANDROID_NDK/sysroot/usr/include/ -isystem $ANDROID_NDK/sysroot/usr/include/arm-linux-androideabi/ -isystem $ANDROID_ROOT/usr/include/ -isystem $ANDROID_NDK/sources/android/cpufeatures/ -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target armv7-none-linux-androideabi -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -z text -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-ignored-optimization-argument -Wl,--fix-cortex-a8 -L$ANDROID_CPP/libs/armeabi-v7a/ -L$ANDROID_ROOT/usr/lib/ -Wl,--no-undefined -nostdlib++"
         export ANDROID_PREFIX="$ANDROID_BIN/bin/arm-linux-androideabi"
         export ANDROID_LIBS="-lc++_static -lc++abi -landroid_support -ldl -lm -lc"
         ;;
     android-arm64)
         export ANDROID_BIN="$ANDROID_NDK/toolchains/aarch64-linux-android-4.9/prebuilt/$KERNEL-$ARCH/"
         export ANDROID_ROOT="$ANDROID_NDK/platforms/android-21/arch-arm64/"
-        export ANDROID_FLAGS="--gcc-toolchain=$ANDROID_BIN --sysroot=$ANDROID_ROOT -isystem $ANDROID_CPP/include/ -isystem $ANDROID_CPP/../llvm-libc++abi/include/ -isystem $ANDROID_NDK/sources/android/support/include/ -isystem $ANDROID_CPP/libs/arm64-v8a/include/ -isystem $ANDROID_NDK/sysroot/usr/include/ -isystem $ANDROID_NDK/sysroot/usr/include/aarch64-linux-android/ -isystem $ANDROID_ROOT/usr/include/ -isystem $ANDROID_NDK/sources/android/cpufeatures/ -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target aarch64-none-linux-android -march=armv8-a -z text -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-ignored-optimization-argument -L$ANDROID_CPP/libs/arm64-v8a/ -L$ANDROID_ROOT/usr/lib/ -Wl,--no-undefined -static-libstdc++"
+        export ANDROID_FLAGS="--gcc-toolchain=$ANDROID_BIN --sysroot=$ANDROID_ROOT -isystem $ANDROID_CPP/include/ -isystem $ANDROID_CPP/../llvm-libc++abi/include/ -isystem $ANDROID_NDK/sources/android/support/include/ -isystem $ANDROID_CPP/libs/arm64-v8a/include/ -isystem $ANDROID_NDK/sysroot/usr/include/ -isystem $ANDROID_NDK/sysroot/usr/include/aarch64-linux-android/ -isystem $ANDROID_ROOT/usr/include/ -isystem $ANDROID_NDK/sources/android/cpufeatures/ -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target aarch64-none-linux-android -march=armv8-a -z text -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-ignored-optimization-argument -L$ANDROID_CPP/libs/arm64-v8a/ -L$ANDROID_ROOT/usr/lib/ -Wl,--no-undefined -nostdlib++"
         export ANDROID_PREFIX="$ANDROID_BIN/bin/aarch64-linux-android"
         export ANDROID_LIBS="-lc++_static -lc++abi -ldl -lm -lc"
         ;;
     android-x86)
         export ANDROID_BIN="$ANDROID_NDK/toolchains/x86-4.9/prebuilt/$KERNEL-$ARCH/"
         export ANDROID_ROOT="$ANDROID_NDK/platforms/android-21/arch-x86/"
-        export ANDROID_FLAGS="--gcc-toolchain=$ANDROID_BIN --sysroot=$ANDROID_ROOT -isystem $ANDROID_CPP/include/ -isystem $ANDROID_CPP/../llvm-libc++abi/include/ -isystem $ANDROID_NDK/sources/android/support/include/ -isystem $ANDROID_CPP/libs/x86/include/ -isystem $ANDROID_NDK/sysroot/usr/include/ -isystem $ANDROID_NDK/sysroot/usr/include/i686-linux-android/ -isystem $ANDROID_ROOT/usr/include/ -isystem $ANDROID_NDK/sources/android/cpufeatures/ -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target i686-none-linux-android -march=i686 -mtune=atom -mssse3 -mfpmath=sse -z text -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-ignored-optimization-argument -L$ANDROID_CPP/libs/x86/ -L$ANDROID_ROOT/usr/lib/ -Wl,--no-undefined -static-libstdc++"
+        export ANDROID_FLAGS="--gcc-toolchain=$ANDROID_BIN --sysroot=$ANDROID_ROOT -isystem $ANDROID_CPP/include/ -isystem $ANDROID_CPP/../llvm-libc++abi/include/ -isystem $ANDROID_NDK/sources/android/support/include/ -isystem $ANDROID_CPP/libs/x86/include/ -isystem $ANDROID_NDK/sysroot/usr/include/ -isystem $ANDROID_NDK/sysroot/usr/include/i686-linux-android/ -isystem $ANDROID_ROOT/usr/include/ -isystem $ANDROID_NDK/sources/android/cpufeatures/ -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target i686-none-linux-android -march=i686 -mtune=atom -mssse3 -mfpmath=sse -z text -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-ignored-optimization-argument -L$ANDROID_CPP/libs/x86/ -L$ANDROID_ROOT/usr/lib/ -Wl,--no-undefined -nostdlib++"
         export ANDROID_PREFIX="$ANDROID_BIN/bin/i686-linux-android"
         export ANDROID_LIBS="-lc++_static -lc++abi -landroid_support -ldl -lm -lc"
         ;;
     android-x86_64)
         export ANDROID_BIN="$ANDROID_NDK/toolchains/x86_64-4.9/prebuilt/$KERNEL-$ARCH/"
         export ANDROID_ROOT="$ANDROID_NDK/platforms/android-21/arch-x86_64/"
-        export ANDROID_FLAGS="--gcc-toolchain=$ANDROID_BIN --sysroot=$ANDROID_ROOT -isystem $ANDROID_CPP/include/ -isystem $ANDROID_CPP/../llvm-libc++abi/include/ -isystem $ANDROID_NDK/sources/android/support/include/ -isystem $ANDROID_CPP/libs/x86_64/include/ -isystem $ANDROID_NDK/sysroot/usr/include/ -isystem $ANDROID_NDK/sysroot/usr/include/x86_64-linux-android/ -isystem $ANDROID_ROOT/usr/include/ -isystem $ANDROID_NDK/sources/android/cpufeatures/ -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target x86_64-none-linux-android -march=x86-64 -mtune=atom -z text -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-ignored-optimization-argument -L$ANDROID_CPP/libs/x86_64/ -L$ANDROID_ROOT/usr/lib64/ -Wl,--no-undefined -static-libstdc++"
+        export ANDROID_FLAGS="--gcc-toolchain=$ANDROID_BIN --sysroot=$ANDROID_ROOT -isystem $ANDROID_CPP/include/ -isystem $ANDROID_CPP/../llvm-libc++abi/include/ -isystem $ANDROID_NDK/sources/android/support/include/ -isystem $ANDROID_CPP/libs/x86_64/include/ -isystem $ANDROID_NDK/sysroot/usr/include/ -isystem $ANDROID_NDK/sysroot/usr/include/x86_64-linux-android/ -isystem $ANDROID_ROOT/usr/include/ -isystem $ANDROID_NDK/sources/android/cpufeatures/ -D__ANDROID_API__=21 -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector-strong -target x86_64-none-linux-android -march=x86-64 -mtune=atom -z text -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-ignored-optimization-argument -L$ANDROID_CPP/libs/x86_64/ -L$ANDROID_ROOT/usr/lib64/ -Wl,--no-undefined -nostdlib++"
         export ANDROID_PREFIX="$ANDROID_BIN/bin/x86_64-linux-android"
         export ANDROID_LIBS="-lc++_static -lc++abi -ldl -lm -lc"
         ;;
@@ -164,7 +164,7 @@ function sedinplace {
 }
 
 if [[ -z ${PROJECTS:-} ]]; then
-    PROJECTS=(opencv ffmpeg flycapture spinnaker libdc1394 libfreenect libfreenect2 librealsense librealsense2 videoinput artoolkitplus chilitags flandmark hdf5 mkl mkl-dnn dnnl openblas arpack-ng cminpack fftw gsl cpython numpy llvm libpostal leptonica tesseract caffe cuda mxnet tensorflow tensorrt ale onnx ngraph onnxruntime liquidfun qt skia cpu_features systems)
+    PROJECTS=(opencv ffmpeg flycapture spinnaker libdc1394 libfreenect libfreenect2 librealsense librealsense2 videoinput artoolkitplus chilitags flandmark hdf5 mkl mkl-dnn dnnl openblas arpack-ng cminpack fftw gsl cpython numpy scipy llvm libpostal leptonica tesseract caffe cuda mxnet tensorflow tensorrt ale onnx ngraph onnxruntime liquidfun qt skia cpu_features systems)
 fi
 
 for PROJECT in ${PROJECTS[@]}; do

diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh
@@ -52,7 +52,7 @@ case $PLATFORM in
         "$CPYTHON_HOST_PATH/bin/python3.7" -m pip install --target="$CPYTHON_HOST_PATH/lib/python3.7/" crossenv
         "$CPYTHON_HOST_PATH/bin/python3.7" -m crossenv "$CPYTHON_PATH/bin/python3.7" crossenv
         source crossenv/bin/activate
-        ATLAS=None CC="arm-linux-gnueabihf-gcc -std=c99 -march=armv6 -mfpu=vfp -mfloat-abi=hard" python setup.py build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
+        ATLAS=None CC="arm-linux-gnueabihf-gcc -std=c99 -march=armv6 -mfpu=vfp -mfloat-abi=hard" python setup.py --quiet build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
         arm-linux-gnueabihf-strip $(find ../ -iname *.so)
         ;;
     linux-arm64)
@@ -63,7 +63,7 @@ case $PLATFORM in
         "$CPYTHON_HOST_PATH/bin/python3.7" -m pip install --target="$CPYTHON_HOST_PATH/lib/python3.7/" crossenv
         "$CPYTHON_HOST_PATH/bin/python3.7" -m crossenv "$CPYTHON_PATH/bin/python3.7" crossenv
         source crossenv/bin/activate
-        ATLAS=None CC="aarch64-linux-gnu-gcc -mabi=lp64" python setup.py build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
+        ATLAS=None CC="aarch64-linux-gnu-gcc -mabi=lp64" python setup.py --quiet build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
         aarch64-linux-gnu-strip $(find ../ -iname *.so)
         ;;
     linux-ppc64le)
@@ -74,7 +74,7 @@ case $PLATFORM in
         "$CPYTHON_HOST_PATH/bin/python3.7" -m pip install --target="$CPYTHON_HOST_PATH/lib/python3.7/" crossenv
         "$CPYTHON_HOST_PATH/bin/python3.7" -m crossenv "$CPYTHON_PATH/bin/python3.7" crossenv
         source crossenv/bin/activate
-        ATLAS=None CC="powerpc64le-linux-gnu-gcc -m64" python setup.py build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
+        ATLAS=None CC="powerpc64le-linux-gnu-gcc -m64" python setup.py --quiet build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
         powerpc64le-linux-gnu-strip $(find ../ -iname *.so)
         ;;
     linux-x86)
@@ -83,24 +83,24 @@ case $PLATFORM in
         export PYTHONPATH="$INSTALL_PATH/lib/python3.7/site-packages/"
         mkdir -p "$PYTHONPATH"
         chmod +x "$CPYTHON_PATH/bin/python3.7"
-        ATLAS=None CC="gcc -m32" "$CPYTHON_PATH/bin/python3.7" setup.py build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
+        ATLAS=None CC="gcc -m32" "$CPYTHON_PATH/bin/python3.7" setup.py --quiet build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
         strip $(find ../ -iname *.so)
         ;;
     linux-x86_64)
-        # setup.py won't pick up the right libgfortran.so without this
+        # setup.py  won't pick up the right libgfortran.so without this
         export LD_LIBRARY_PATH="$OPENBLAS_PATH/lib/:$CPYTHON_PATH/lib/"
         export PYTHONPATH="$INSTALL_PATH/lib/python3.7/site-packages/"
         mkdir -p "$PYTHONPATH"
         chmod +x "$CPYTHON_PATH/bin/python3.7"
-        ATLAS=None CC="gcc -m64" "$CPYTHON_PATH/bin/python3.7" setup.py build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
+        ATLAS=None CC="gcc -m64" "$CPYTHON_PATH/bin/python3.7" setup.py --quiet build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
         strip $(find ../ -iname *.so)
         ;;
     macosx-*)
         export LD_LIBRARY_PATH="$OPENBLAS_PATH/lib/:$CPYTHON_PATH/lib/"
         export PYTHONPATH="$INSTALL_PATH/lib/python3.7/site-packages/"
         mkdir -p "$PYTHONPATH"
         chmod +x "$CPYTHON_PATH/bin/python3.7"
-        ATLAS=None "$CPYTHON_PATH/bin/python3.7" setup.py build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
+        ATLAS=None "$CPYTHON_PATH/bin/python3.7" setup.py --quiet build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ install --prefix $INSTALL_PATH
         # need to add RPATH so it can find MKL in cache
         for f in $(find ../ -iname *.so); do install_name_tool -add_rpath @loader_path/../../../ $f; done
         ;;
@@ -115,7 +115,7 @@ case $PLATFORM in
         # the build sometimes fails with multiple jobs
         MAKEJ=1
         # setup.py install doesn't accept absolute paths on Windows
-        ATLAS=None "$CPYTHON_PATH/bin/python.exe" setup.py build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ -L$CPYTHON_PATH/libs/ install --prefix ..
+        ATLAS=None "$CPYTHON_PATH/bin/python.exe" setup.py --quiet build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ -L$CPYTHON_PATH/libs/ install --prefix ..
         ;;
     windows-x86_64)
         CPYTHON_PATH=$(cygpath $CPYTHON_PATH)
@@ -126,7 +126,7 @@ case $PLATFORM in
         # the build sometimes fails with multiple jobs
         MAKEJ=1
         # setup.py install doesn't accept absolute paths on Windows
-        ATLAS=None "$CPYTHON_PATH/bin/python.exe" setup.py build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ -L$CPYTHON_PATH/libs/ install --prefix ..
+        ATLAS=None "$CPYTHON_PATH/bin/python.exe" setup.py --quiet build -j $MAKEJ build_ext -I$CPYTHON_PATH/include/ -L$CPYTHON_PATH/lib/ -L$CPYTHON_PATH/libs/ install --prefix ..
         ;;
     *)
         echo "Error: Platform \"$PLATFORM\" is not supported"

diff --git a/openblas/cppbuild.sh b/openblas/cppbuild.sh
@@ -192,10 +192,9 @@ case $PLATFORM in
         patch -Np1 -d ../OpenBLAS-$OPENBLAS_VERSION-nolapack/ < ../../../OpenBLAS-macosx.patch
         export CC="$(ls -1 /usr/local/bin/gcc-? | head -n 1)"
         export FC="$(ls -1 /usr/local/bin/gfortran-? | head -n 1)"
-        export LDFLAGS='-s -Wl,-rpath,@loader_path/'
+        export LDFLAGS='-s -Wl,-rpath,@loader_path/ -lgfortran'
         export BINARY=64
         export DYNAMIC_ARCH=1
-        export LDFLAGS="-static-libgcc -static-libgfortran -lgfortran /usr/local/lib/gcc/?/libquadmath.a"
         export NO_AVX512=1
         ;;
     windows-x86)

diff --git a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java
@@ -46,7 +46,7 @@
               preload = {"gcc_s@.1", "quadmath@.0", "gfortran@.5", "gfortran@.4", "gfortran@.3", "openblas@.0#openblas_nolapack@.0"},
               preloadpath = {"/opt/intel/lib/", "/opt/intel/mkl/lib/"}),
     @Platform(value = "android", link = "openblas", preload = ""),
-    @Platform(value = "macosx",  link = "openblas_nolapack", preload = "openblas#openblas_nolapack"),
+    @Platform(value = "macosx",  preloadpath = {"/usr/local/lib/gcc/8/", "/usr/local/lib/gcc/7/", "/usr/local/lib/gcc/6/", "/usr/local/lib/gcc/5/"}),
     @Platform(value = "windows", preload = "libopenblas#libopenblas_nolapack"),
     @Platform(value = "windows-x86",    preloadpath = {"C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/redist/ia32/compiler/",
                                                        "C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/redist/ia32/mkl/"}),