use prefix in more places

MacPython · Oct 29, 2023 · 5758b60 · 5758b60
1 parent 0225ae3
commit 5758b60
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/local/scipy_openblas64/__init__.py b/local/scipy_openblas64/__init__.py
@@ -109,7 +109,7 @@ def get_openblas_config():
             libnames = [x for x in os.listdir(lib_dir) if x.endswith(".dll")]
         else:
             # Get openblas*
-            libnames = [x for x in os.listdir(lib_dir) if x.startswith("lib")]
+            libnames = [x for x in os.listdir(lib_dir) if x.startswith("libscipy")]
 
         dll = ctypes.CDLL(os.path.join(lib_dir, libnames[0]), ctypes.RTLD_GLOBAL)
     openblas_config = dll.openblas_get_config64_

diff --git a/tools/build_openblas.sh b/tools/build_openblas.sh
@@ -105,7 +105,7 @@ if [ "$if_bits" == "64" ]; then
     # do it ourselves
     set -x  # echo commands
     static_libname=$(find . -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a' | tail -1)
-    make -C exports $interface64_flags objcopy.def
+    make -C exports SYMBOLPREFIX=scipy_ $interface64_flags objcopy.def
     objcopy --redefine-syms exports/objcopy.def "${static_libname}" "${static_libname}.renamed"
     cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${static_libname}"
     cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${DLL_BASENAME}.a"

diff --git a/tools/build_steps.sh b/tools/build_steps.sh
@@ -193,7 +193,7 @@ function do_build_lib {
     tar zcvf libs/$out_name \
         $BUILD_PREFIX/include/*blas* \
         $BUILD_PREFIX/include/*lapack* \
-        $BUILD_PREFIX/lib/lib* \
+        $BUILD_PREFIX/lib/libscipyopenblas* \
         $BUILD_PREFIX/lib/pkgconfig/openblas* \
         $BUILD_PREFIX/lib/cmake/openblas
 }