Skip to content

Commit bb96e46

Browse files
authored
Introduce LIBNAMEPREFIX to avoid messing with the internal LIBPREFIX
1 parent 25b300b commit bb96e46

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

Makefile.install

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ endif
172172

173173
@echo Generating $(LIBSONAMEBASE)$(SUFFIX64).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"
174174
@echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(PKGFILE)"
175-
@echo 'libprefix='$(LIBPREFIX) >> "$(PKGFILE)"
175+
@echo 'libprefix='$(LIBNAMEPREFIX) >> "$(PKGFILE)"
176176
@echo 'libnamesuffix='$(LIBNAMESUFFIX) >> "$(PKGFILE)"
177177
@echo 'libsuffix='$(SYMBOLSUFFIX) >> "$(PKGFILE)"
178178
@echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> "$(PKGFILE)"
@@ -190,7 +190,7 @@ endif
190190
ifneq ($(NO_SHARED),1)
191191
#ifeq logical or
192192
ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD OpenBSD DragonFly))
193-
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX)$(LIBSONAMEBASE)$(LIBNAMESUFFIX).so)" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
193+
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX)$(LIBNAMESUFFIX).so)" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
194194
endif
195195
ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT))
196196
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_BINARY_DIR}/$(LIBDLLNAME))" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"

Makefile.rule

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
# This library's version
66
VERSION = 0.3.26.dev
77

8+
# If you set this prefix, the library name will be lib$(LIBNAMESUFFIX)openblas.a
9+
# and lib$(LIBNAMESUFFIX)openblas.so, with a matching soname in the shared library
10+
#
11+
# LIBNAMEPREFIX = scipy
12+
813
# If you set the suffix, the library name will be libopenblas_$(LIBNAMESUFFIX).a
914
# and libopenblas_$(LIBNAMESUFFIX).so. Meanwhile, the soname in shared library
1015
# is libopenblas_$(LIBNAMESUFFIX).so.0.

Makefile.system

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,16 +1516,20 @@ ifndef LIBSONAMEBASE
15161516
LIBSONAMEBASE = openblas
15171517
endif
15181518

1519+
ifndef LIBNAMEPREFIX
1520+
LIBNAMEPREFIX =
1521+
endif
1522+
15191523
ifndef LIBNAMESUFFIX
15201524
LIBNAMEBASE = $(SYMBOLPREFIX)$(LIBSONAMEBASE)$(SYMBOLSUFFIX)
15211525
else
15221526
LIBNAMEBASE = $(SYMBOLPREFIX)$(LIBSONAMEBASE)$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
15231527
endif
15241528

15251529
ifeq ($(OSNAME), CYGWIN_NT)
1526-
LIBPREFIX = cyg$(LIBNAMEBASE)
1530+
LIBPREFIX = cyg$(LIBNAMEPREFIX)$(LIBNAMEBASE)
15271531
else
1528-
LIBPREFIX = lib$(LIBNAMEBASE)
1532+
LIBPREFIX = lib$(LIBNAMEPREFIX)$(LIBNAMEBASE)
15291533
endif
15301534

15311535
KERNELDIR = $(TOPDIR)/kernel/$(ARCH)
@@ -1705,8 +1709,8 @@ endif
17051709
endif
17061710

17071711
ifeq ($(FIXED_LIBNAME),1)
1708-
LIBNAME = $(LIBPREFIX)$(LIBSONAMEBASE)$(LIBNAMESUFFIX).$(LIBSUFFIX)
1709-
LIBNAME_P = $(LIBPREFIX)$(LISOBNAMEBASE)$(LIBNAMESUFFIX)_p.$(LIBSUFFIX)
1712+
LIBNAME = lib$(LIBNAMEPREFIX)$(LIBSONAMEBASE)$(LIBNAMESUFFIX).$(LIBSUFFIX)
1713+
LIBNAME_P = lib$(LIBNAMEPREFIX)$(LISOBNAMEBASE)$(LIBNAMESUFFIX)_p.$(LIBSUFFIX)
17101714
endif
17111715

17121716
LIBDLLNAME = $(LIBPREFIX).dll

0 commit comments

Comments
 (0)