| 1 |
commit: edaaf5f0bf2f6f203fcc6c9cc37a2e5903e56eaa |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Nov 16 16:55:56 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 23 20:33:51 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edaaf5f0 |
| 7 |
|
| 8 |
sci-libs/openblas: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22975 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
sci-libs/openblas/files/dont-clobber-fflags.patch | 31 ----- |
| 16 |
.../openblas-0.3.10-dont-clobber-fflags.patch | 26 ---- |
| 17 |
sci-libs/openblas/files/shared-blas-lapack.patch | 137 --------------------- |
| 18 |
3 files changed, 194 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-libs/openblas/files/dont-clobber-fflags.patch b/sci-libs/openblas/files/dont-clobber-fflags.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index 21bbec4b1b3b..000000000000 |
| 23 |
--- a/sci-libs/openblas/files/dont-clobber-fflags.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,31 +0,0 @@ |
| 26 |
-From 05c96dad9b26cc1f00831661dc55139dcc9d5680 Mon Sep 17 00:00:00 2001 |
| 27 |
-From: Michael Orlitzky <michael@××××××××.com> |
| 28 |
-Date: Thu, 11 Jun 2020 18:32:17 -0400 |
| 29 |
-Subject: [PATCH 1/1] Makefile: don't clobber fortran flags while building |
| 30 |
- lapack. |
| 31 |
- |
| 32 |
-When a user has the FFLAGS environment variable set, it clobbers the |
| 33 |
-flags used to compile lapack. This can lead to "rare and hard to |
| 34 |
-reproduce crashes" or test failures, as we have observed in Gentoo. |
| 35 |
- |
| 36 |
-Issue: https://github.com/xianyi/OpenBLAS/issues/2657 |
| 37 |
---- |
| 38 |
- Makefile | 2 +- |
| 39 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 40 |
- |
| 41 |
-diff --git a/Makefile b/Makefile |
| 42 |
-index a22e16ba..2bae565e 100644 |
| 43 |
---- a/Makefile |
| 44 |
-+++ b/Makefile |
| 45 |
-@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild |
| 46 |
- lapack_prebuild : |
| 47 |
- ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) |
| 48 |
- -@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc |
| 49 |
-- -@echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 50 |
-+ -@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 51 |
- -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 52 |
- -@echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 53 |
- -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 54 |
--- |
| 55 |
-2.26.2 |
| 56 |
- |
| 57 |
|
| 58 |
diff --git a/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch b/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch |
| 59 |
deleted file mode 100644 |
| 60 |
index 4890b7377ab5..000000000000 |
| 61 |
--- a/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch |
| 62 |
+++ /dev/null |
| 63 |
@@ -1,26 +0,0 @@ |
| 64 |
-Rebased version of previous patch below. |
| 65 |
----- |
| 66 |
-From 05c96dad9b26cc1f00831661dc55139dcc9d5680 Mon Sep 17 00:00:00 2001 |
| 67 |
-From: Michael Orlitzky <michael@××××××××.com> |
| 68 |
-Date: Thu, 11 Jun 2020 18:32:17 -0400 |
| 69 |
-Subject: [PATCH 1/1] Makefile: don't clobber fortran flags while building |
| 70 |
- lapack. |
| 71 |
- |
| 72 |
-When a user has the FFLAGS environment variable set, it clobbers the |
| 73 |
-flags used to compile lapack. This can lead to "rare and hard to |
| 74 |
-reproduce crashes" or test failures, as we have observed in Gentoo. |
| 75 |
- |
| 76 |
-Issue: https://github.com/xianyi/OpenBLAS/issues/2657 |
| 77 |
-diff --git a/Makefile b/Makefile |
| 78 |
-index e113026..dd8b655 100644 |
| 79 |
---- a/Makefile |
| 80 |
-+++ b/Makefile |
| 81 |
-@@ -263,7 +263,7 @@ prof_lapack : lapack_prebuild |
| 82 |
- lapack_prebuild : |
| 83 |
- ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) |
| 84 |
- -@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc |
| 85 |
-- -@echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 86 |
-+ -@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 87 |
- -@echo "FFLAGS_DRV = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 88 |
- -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 89 |
- -@echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc |
| 90 |
|
| 91 |
diff --git a/sci-libs/openblas/files/shared-blas-lapack.patch b/sci-libs/openblas/files/shared-blas-lapack.patch |
| 92 |
deleted file mode 100644 |
| 93 |
index fc77427362c1..000000000000 |
| 94 |
--- a/sci-libs/openblas/files/shared-blas-lapack.patch |
| 95 |
+++ /dev/null |
| 96 |
@@ -1,137 +0,0 @@ |
| 97 |
-diff --git a/sci-libs/openblas/files/Makefile b/sci-libs/openblas/files/Makefile |
| 98 |
-index 20ec74e..87e842f 100644 |
| 99 |
---- a/interface/Makefile |
| 100 |
-+++ b/interface/Makefile |
| 101 |
-@@ -2151,3 +2151,132 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PSUFFIX) : zgeadd.c |
| 102 |
- |
| 103 |
- cblas_xerbla.$(SUFFIX) cblas_xerbla.$(PSUFFIX) : xerbla.c |
| 104 |
- $(CC) -c $(CFLAGS) -DCBLAS $< -o $(@F) |
| 105 |
-+ |
| 106 |
-+############################################################################# |
| 107 |
-+# Customized shared objects |
| 108 |
-+ |
| 109 |
-+FSBLAS1OBJS = \ |
| 110 |
-+ saxpy.$(SUFFIX) sswap.$(SUFFIX) \ |
| 111 |
-+ scopy.$(SUFFIX) sscal.$(SUFFIX) \ |
| 112 |
-+ sdot.$(SUFFIX) sdsdot.$(SUFFIX) dsdot.$(SUFFIX) \ |
| 113 |
-+ sasum.$(SUFFIX) snrm2.$(SUFFIX) \ |
| 114 |
-+ smax.$(SUFFIX) samax.$(SUFFIX) ismax.$(SUFFIX) isamax.$(SUFFIX) \ |
| 115 |
-+ smin.$(SUFFIX) samin.$(SUFFIX) ismin.$(SUFFIX) isamin.$(SUFFIX) \ |
| 116 |
-+ srot.$(SUFFIX) srotg.$(SUFFIX) srotm.$(SUFFIX) srotmg.$(SUFFIX) \ |
| 117 |
-+ saxpby.$(SUFFIX) |
| 118 |
-+ |
| 119 |
-+FSBLAS2OBJS = \ |
| 120 |
-+ sgemv.$(SUFFIX) sger.$(SUFFIX) \ |
| 121 |
-+ strsv.$(SUFFIX) strmv.$(SUFFIX) ssymv.$(SUFFIX) \ |
| 122 |
-+ ssyr.$(SUFFIX) ssyr2.$(SUFFIX) sgbmv.$(SUFFIX) \ |
| 123 |
-+ ssbmv.$(SUFFIX) sspmv.$(SUFFIX) \ |
| 124 |
-+ sspr.$(SUFFIX) sspr2.$(SUFFIX) \ |
| 125 |
-+ stbsv.$(SUFFIX) stbmv.$(SUFFIX) \ |
| 126 |
-+ stpsv.$(SUFFIX) stpmv.$(SUFFIX) |
| 127 |
-+ |
| 128 |
-+FSBLAS3OBJS = \ |
| 129 |
-+ sgemm.$(SUFFIX) ssymm.$(SUFFIX) strmm.$(SUFFIX) \ |
| 130 |
-+ strsm.$(SUFFIX) ssyrk.$(SUFFIX) ssyr2k.$(SUFFIX) \ |
| 131 |
-+ somatcopy.$(SUFFIX) simatcopy.$(SUFFIX)\ |
| 132 |
-+ sgeadd.$(SUFFIX) |
| 133 |
-+ |
| 134 |
-+ |
| 135 |
-+FDBLAS1OBJS = \ |
| 136 |
-+ daxpy.$(SUFFIX) dswap.$(SUFFIX) \ |
| 137 |
-+ dcopy.$(SUFFIX) dscal.$(SUFFIX) \ |
| 138 |
-+ ddot.$(SUFFIX) \ |
| 139 |
-+ dasum.$(SUFFIX) dnrm2.$(SUFFIX) \ |
| 140 |
-+ dmax.$(SUFFIX) damax.$(SUFFIX) idmax.$(SUFFIX) idamax.$(SUFFIX) \ |
| 141 |
-+ dmin.$(SUFFIX) damin.$(SUFFIX) idmin.$(SUFFIX) idamin.$(SUFFIX) \ |
| 142 |
-+ drot.$(SUFFIX) drotg.$(SUFFIX) drotm.$(SUFFIX) drotmg.$(SUFFIX) \ |
| 143 |
-+ daxpby.$(SUFFIX) |
| 144 |
-+ |
| 145 |
-+FDBLAS2OBJS = \ |
| 146 |
-+ dgemv.$(SUFFIX) dger.$(SUFFIX) \ |
| 147 |
-+ dtrsv.$(SUFFIX) dtrmv.$(SUFFIX) dsymv.$(SUFFIX) \ |
| 148 |
-+ dsyr.$(SUFFIX) dsyr2.$(SUFFIX) dgbmv.$(SUFFIX) \ |
| 149 |
-+ dsbmv.$(SUFFIX) dspmv.$(SUFFIX) \ |
| 150 |
-+ dspr.$(SUFFIX) dspr2.$(SUFFIX) \ |
| 151 |
-+ dtbsv.$(SUFFIX) dtbmv.$(SUFFIX) \ |
| 152 |
-+ dtpsv.$(SUFFIX) dtpmv.$(SUFFIX) |
| 153 |
-+ |
| 154 |
-+FDBLAS3OBJS = \ |
| 155 |
-+ dgemm.$(SUFFIX) dsymm.$(SUFFIX) dtrmm.$(SUFFIX) \ |
| 156 |
-+ dtrsm.$(SUFFIX) dsyrk.$(SUFFIX) dsyr2k.$(SUFFIX) \ |
| 157 |
-+ domatcopy.$(SUFFIX) dimatcopy.$(SUFFIX)\ |
| 158 |
-+ dgeadd.$(SUFFIX) |
| 159 |
-+ |
| 160 |
-+FCBLAS1OBJS = \ |
| 161 |
-+ caxpy.$(SUFFIX) caxpyc.$(SUFFIX) cswap.$(SUFFIX) \ |
| 162 |
-+ ccopy.$(SUFFIX) cscal.$(SUFFIX) csscal.$(SUFFIX) \ |
| 163 |
-+ cdotc.$(SUFFIX) cdotu.$(SUFFIX) \ |
| 164 |
-+ scasum.$(SUFFIX) scnrm2.$(SUFFIX) \ |
| 165 |
-+ scamax.$(SUFFIX) icamax.$(SUFFIX) \ |
| 166 |
-+ scamin.$(SUFFIX) icamin.$(SUFFIX) \ |
| 167 |
-+ csrot.$(SUFFIX) crotg.$(SUFFIX) \ |
| 168 |
-+ caxpby.$(SUFFIX) |
| 169 |
-+ |
| 170 |
-+FCBLAS2OBJS = \ |
| 171 |
-+ cgemv.$(SUFFIX) cgeru.$(SUFFIX) cgerc.$(SUFFIX) \ |
| 172 |
-+ ctrsv.$(SUFFIX) ctrmv.$(SUFFIX) \ |
| 173 |
-+ csyr2.$(SUFFIX) cgbmv.$(SUFFIX) \ |
| 174 |
-+ csbmv.$(SUFFIX) \ |
| 175 |
-+ cspr2.$(SUFFIX) \ |
| 176 |
-+ ctbsv.$(SUFFIX) ctbmv.$(SUFFIX) \ |
| 177 |
-+ ctpsv.$(SUFFIX) ctpmv.$(SUFFIX) \ |
| 178 |
-+ chemv.$(SUFFIX) chbmv.$(SUFFIX) \ |
| 179 |
-+ cher.$(SUFFIX) cher2.$(SUFFIX) \ |
| 180 |
-+ chpmv.$(SUFFIX) chpr.$(SUFFIX) chpr2.$(SUFFIX) |
| 181 |
-+ |
| 182 |
-+FCBLAS3OBJS = \ |
| 183 |
-+ cgemm.$(SUFFIX) csymm.$(SUFFIX) ctrmm.$(SUFFIX) \ |
| 184 |
-+ ctrsm.$(SUFFIX) csyrk.$(SUFFIX) csyr2k.$(SUFFIX) \ |
| 185 |
-+ chemm.$(SUFFIX) cherk.$(SUFFIX) cher2k.$(SUFFIX) \ |
| 186 |
-+ comatcopy.$(SUFFIX) cimatcopy.$(SUFFIX)\ |
| 187 |
-+ cgeadd.$(SUFFIX) |
| 188 |
-+ |
| 189 |
-+FZBLAS1OBJS = \ |
| 190 |
-+ zaxpy.$(SUFFIX) zaxpyc.$(SUFFIX) zswap.$(SUFFIX) \ |
| 191 |
-+ zcopy.$(SUFFIX) zscal.$(SUFFIX) zdscal.$(SUFFIX) \ |
| 192 |
-+ zdotc.$(SUFFIX) zdotu.$(SUFFIX) \ |
| 193 |
-+ dzasum.$(SUFFIX) dznrm2.$(SUFFIX) \ |
| 194 |
-+ dzamax.$(SUFFIX) izamax.$(SUFFIX) \ |
| 195 |
-+ dzamin.$(SUFFIX) izamin.$(SUFFIX) \ |
| 196 |
-+ zdrot.$(SUFFIX) zrotg.$(SUFFIX) \ |
| 197 |
-+ zaxpby.$(SUFFIX) |
| 198 |
-+ |
| 199 |
-+FZBLAS2OBJS = \ |
| 200 |
-+ zgemv.$(SUFFIX) zgeru.$(SUFFIX) zgerc.$(SUFFIX) \ |
| 201 |
-+ ztrsv.$(SUFFIX) ztrmv.$(SUFFIX) \ |
| 202 |
-+ zsyr2.$(SUFFIX) zgbmv.$(SUFFIX) \ |
| 203 |
-+ zsbmv.$(SUFFIX) \ |
| 204 |
-+ zspr2.$(SUFFIX) \ |
| 205 |
-+ ztbsv.$(SUFFIX) ztbmv.$(SUFFIX) \ |
| 206 |
-+ ztpsv.$(SUFFIX) ztpmv.$(SUFFIX) \ |
| 207 |
-+ zhemv.$(SUFFIX) zhbmv.$(SUFFIX) \ |
| 208 |
-+ zher.$(SUFFIX) zher2.$(SUFFIX) \ |
| 209 |
-+ zhpmv.$(SUFFIX) zhpr.$(SUFFIX) zhpr2.$(SUFFIX) |
| 210 |
-+ |
| 211 |
-+FZBLAS3OBJS = \ |
| 212 |
-+ zgemm.$(SUFFIX) zsymm.$(SUFFIX) ztrmm.$(SUFFIX) \ |
| 213 |
-+ ztrsm.$(SUFFIX) zsyrk.$(SUFFIX) zsyr2k.$(SUFFIX) \ |
| 214 |
-+ zhemm.$(SUFFIX) zherk.$(SUFFIX) zher2k.$(SUFFIX) \ |
| 215 |
-+ zomatcopy.$(SUFFIX) zimatcopy.$(SUFFIX)\ |
| 216 |
-+ zgeadd.$(SUFFIX) |
| 217 |
-+ |
| 218 |
-+shared-blas-lapack: libblas.so.3 libcblas.so.3 liblapack.so.3 |
| 219 |
-+ |
| 220 |
-+# The list of prerequisite is created by comparing with NETLIB BLAS public API. |
| 221 |
-+# The symbol cblas_xerbla is missing here, but it does not seem to be provided |
| 222 |
-+# by libopenblas.so.0 either. |
| 223 |
-+libblas.so.3: $(FSBLAS1OBJS) $(FSBLAS2OBJS) $(FSBLAS3OBJS) $(FDBLAS1OBJS) $(FDBLAS2OBJS) $(FDBLAS3OBJS) $(FCBLAS1OBJS) $(FCBLAS2OBJS) $(FCBLAS3OBJS) $(FZBLAS1OBJS) $(FZBLAS2OBJS) $(FZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o |
| 224 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libblas.so.3 -L.. -lopenblas $(EXTRALIB) |
| 225 |
-+ |
| 226 |
-+libcblas.so.3: $(CSBLAS1OBJS) $(CSBLAS2OBJS) $(CSBLAS3OBJS) $(CDBLAS1OBJS) $(CDBLAS2OBJS) $(CDBLAS3OBJS) $(CCBLAS1OBJS) $(CCBLAS2OBJS) $(CCBLAS3OBJS) $(CZBLAS1OBJS) $(CZBLAS2OBJS) $(CZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o |
| 227 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libcblas.so.3 -L.. -lopenblas $(EXTRALIB) |
| 228 |
-+ |
| 229 |
-+liblapack.so.3: $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) ../kernel/lsame.o ../driver/others/xerbla.o |
| 230 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ ../lapack-netlib/SRC/*.o -Wl,-soname,liblapack.so.3 -L.. -lopenblas $(EXTRALIB) |
| 231 |
-+ |
| 232 |
-+clean:: |
| 233 |
-+ rm -f libblas.so.3 libcblas.so.3 liblapack.so.3 |
Archives