|
1 |
| -From 80863b52c024ed2d5fda80546e7b6a0160531b9a Mon Sep 17 00:00:00 2001 |
| 1 | +From e5f32d54b742caf4e59ef6e7ec0caa16b7f670d3 Mon Sep 17 00:00:00 2001 |
2 | 2 |
|
3 |
| -Date: Sun, 21 Jan 2024 08:35:54 +0200 |
| 3 | +Date: Sun, 21 Jan 2024 22:34:48 +0200 |
4 | 4 | Subject: [PATCH] create a single shared object
|
5 | 5 |
|
6 | 6 | ---
|
7 | 7 | Makefile | 10 ----------
|
8 |
| - Makefile.install | 15 --------------- |
| 8 | + Makefile.install | 16 +--------------- |
9 | 9 | Makefile.system | 3 +++
|
10 | 10 | exports/Makefile | 4 ++--
|
11 |
| - 4 files changed, 5 insertions(+), 27 deletions(-) |
| 11 | + openblas.pc.in | 2 +- |
| 12 | + 5 files changed, 7 insertions(+), 28 deletions(-) |
12 | 13 |
|
13 | 14 | diff --git a/Makefile b/Makefile
|
14 | 15 | index 8621a8b3f..56a449306 100644
|
@@ -71,7 +72,7 @@ index 8621a8b3f..56a449306 100644
|
71 | 72 | do if test -d $$d; then \
|
72 | 73 | $(MAKE) -C $$d $(@F) || exit 1 ; \
|
73 | 74 | diff --git a/Makefile.install b/Makefile.install
|
74 |
| -index 01899b970..105bc4271 100644 |
| 75 | +index 01899b970..958fb9957 100644 |
75 | 76 | --- a/Makefile.install
|
76 | 77 | +++ b/Makefile.install
|
77 | 78 | @@ -90,30 +90,20 @@ endif
|
@@ -122,6 +123,14 @@ index 01899b970..105bc4271 100644
|
122 | 123 | endif
|
123 | 124 |
|
124 | 125 | endif
|
| 126 | +@@ -162,6 +147,7 @@ endif |
| 127 | + |
| 128 | + @echo Generating $(LIBSONAMEBASE)$(SUFFIX64).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)" |
| 129 | + @echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(PKGFILE)" |
| 130 | ++ @echo 'libprefix='$(SYBOLPREFIX) > "$(PKGFILE)" |
| 131 | + @echo 'libsuffix='$(SYMBOLSUFFIX) >> "$(PKGFILE)" |
| 132 | + @echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> "$(PKGFILE)" |
| 133 | + @echo 'openblas_config= USE_64BITINT='$(INTERFACE64) 'DYNAMIC_ARCH='$(DYNAMIC_ARCH) 'DYNAMIC_OLDER='$(DYNAMIC_OLDER) 'NO_CBLAS='$(NO_CBLAS) 'NO_LAPACK='$(NO_LAPACK) 'NO_LAPACKE='$(NO_LAPACKE) 'NO_AFFINITY='$(NO_AFFINITY) 'USE_OPENMP='$(USE_OPENMP) $(CORE) 'MAX_THREADS='$(NUM_THREADS)>> "$(PKGFILE)" |
125 | 134 | diff --git a/Makefile.system b/Makefile.system
|
126 | 135 | index 30b0ddec2..b2c92b99a 100644
|
127 | 136 | --- a/Makefile.system
|
@@ -158,6 +167,18 @@ index 7682f851d..632fa324b 100644
|
158 | 167 | endif
|
159 | 168 |
|
160 | 169 | ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
|
| 170 | +diff --git a/openblas.pc.in b/openblas.pc.in |
| 171 | +index 8ad6e8bee..33209293d 100644 |
| 172 | +--- a/openblas.pc.in |
| 173 | ++++ b/openblas.pc.in |
| 174 | +@@ -2,6 +2,6 @@ Name: openblas |
| 175 | + Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version |
| 176 | + Version: ${version} |
| 177 | + URL: https://github.com/xianyi/OpenBLAS |
| 178 | +-Libs: -L${libdir} -lopenblas${libsuffix} |
| 179 | ++Libs: -L${libdir} -l${libprefix}openblas${libsuffix} |
| 180 | + Libs.private: ${extralib} |
| 181 | + Cflags: -I${includedir} |
161 | 182 | --
|
162 | 183 | 2.34.1
|
163 | 184 |
|
0 commit comments