diff --git a/qgis_bundle/recipes/openblas/recipe.sh b/qgis_bundle/recipes/openblas/recipe.sh index aa953075..cd306dd4 100644 --- a/qgis_bundle/recipes/openblas/recipe.sh +++ b/qgis_bundle/recipes/openblas/recipe.sh @@ -11,7 +11,6 @@ function bundle_openblas() { function fix_binaries_openblas() { install_name_id @rpath/$LINK_libopenblas $BUNDLE_LIB_DIR/$LINK_libopenblas - install_name_id @rpath/$LINK_libopenblas_haswellp $BUNDLE_LIB_DIR/$LINK_libopenblas_haswellp for i in \ $LINK_libopenblas \ @@ -19,13 +18,12 @@ function fix_binaries_openblas() { $LINK_libgfortran \ $LINK_gcc_s do - install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_libopenblas_haswellp + install_name_change $DEPS_LIB_DIR/$i @rpath/$i $BUNDLE_LIB_DIR/$LINK_libopenblas done } function fix_binaries_openblas_check() { verify_binary $BUNDLE_LIB_DIR/$LINK_libopenblas - verify_binary $BUNDLE_LIB_DIR/$LINK_libopenblas_haswellp } function fix_paths_openblas() { diff --git a/qgis_bundle/recipes/python_numpy/recipe.sh b/qgis_bundle/recipes/python_numpy/recipe.sh index 504f2c5d..22f79202 100644 --- a/qgis_bundle/recipes/python_numpy/recipe.sh +++ b/qgis_bundle/recipes/python_numpy/recipe.sh @@ -16,7 +16,6 @@ function fix_binaries_python_numpy() { linalg/lapack_lite \ linalg/_umath_linalg do - install_name_change $DEPS_LIB_DIR/$LINK_libopenblas_haswellp @rpath/$LINK_libopenblas_haswellp $NUMPY_EGG_DIR/numpy/$i.cpython-${VERSION_major_python//./}m-darwin.so install_name_change $DEPS_LIB_DIR/$LINK_libopenblas @rpath/$LINK_libopenblas $NUMPY_EGG_DIR/numpy/$i.cpython-${VERSION_major_python//./}m-darwin.so done } diff --git a/qgis_deps/recipes/openblas/recipe.sh b/qgis_deps/recipes/openblas/recipe.sh index 0213b28d..03fb4efd 100644 --- a/qgis_deps/recipes/openblas/recipe.sh +++ b/qgis_deps/recipes/openblas/recipe.sh @@ -7,7 +7,6 @@ source $RECIPES_PATH/gcc/recipe.sh VERSION_openblas=0.3.10 LINK_libopenblas=libopenblas.0.dylib -LINK_libopenblas_haswellp=libopenblas_haswellp-r$VERSION_openblas.dylib # dependencies of this recipe DEPS_openblas=(sqlite libxml2 openssl gcc) @@ -51,15 +50,21 @@ function build_openblas() { push_env export CFLAGS="$CFLAGS -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET" + # lapacke_sggsvd_work.c:48:9: error: implicit declaration of function 'sggsvd_' is invalid in C99 [-Werror,-Wimplicit-function-declaration] + export CFLAGS="$CFLAGS -Wno-implicit-function-declaration" export CXXFLAGS="$CFLAGS" - # Contains FORTRAN LAPAC sources + # Contains FORTRAN LAPACK sources + export DYNAMIC_ARCH=1 + export USE_OPENMP=0 # ? this is 1 in homebrew..?.. + export NO_AVX512=1 + try $MAKESMP FC=gfortran libs netlib shared try $MAKE install PREFIX=$STAGE_PATH - try install_name_tool -change @rpath/$LINK_libquadmath $DEPS_LIB_DIR/$LINK_libquadmath $DEPS_LIB_DIR/$LINK_libopenblas_haswellp - try install_name_tool -change @rpath/$LINK_libgfortran $DEPS_LIB_DIR/$LINK_libgfortran $DEPS_LIB_DIR/$LINK_libopenblas_haswellp - try install_name_tool -change @rpath/$LINK_gcc_s $DEPS_LIB_DIR/$LINK_gcc_s $DEPS_LIB_DIR/$LINK_libopenblas_haswellp + unset DYNAMIC_ARCH + unset USE_OPENMP + unset NO_AVX512 pop_env } @@ -67,7 +72,6 @@ function build_openblas() { # function called after all the compile have been done function postbuild_openblas() { verify_binary lib/$LINK_libopenblas - verify_binary lib/$LINK_libopenblas_haswellp } # function to append information to config file @@ -75,5 +79,4 @@ function add_config_info_openblas() { append_to_config_file "# openblas-${VERSION_openblas}: ${DESC_openblas}" append_to_config_file "export VERSION_openblas=${VERSION_openblas}" append_to_config_file "export LINK_libopenblas=${LINK_libopenblas}" - append_to_config_file "export LINK_libopenblas_haswellp=${LINK_libopenblas_haswellp}" } \ No newline at end of file diff --git a/qgis_deps/recipes/python_numpy/recipe.sh b/qgis_deps/recipes/python_numpy/recipe.sh index 83a2ea7d..e0e3efa9 100644 --- a/qgis_deps/recipes/python_numpy/recipe.sh +++ b/qgis_deps/recipes/python_numpy/recipe.sh @@ -47,8 +47,20 @@ function build_python_numpy() { try cd $BUILD_PATH/python_numpy/build-$ARCH push_env + export OPENBLAS=$STAGE_PATH/lib + export BLAS=None + export LAPACK=None + export ATLAS=None + export ACCELERATE=None + DYLD_LIBRARY_PATH=$STAGE_PATH/lib try $PYTHON setup.py install + unset OPENBLAS + unset BLAS + unset LAPACK + unset ATLAS + unset ACCELERATE + pop_env }