1 |
commit: 12bc6f3be130f759773d55b7d4e07eb30b35cea8 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jan 29 09:08:23 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 20:09:37 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12bc6f3b |
7 |
|
8 |
sci-libs/libcmatrix: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3709 |
11 |
|
12 |
.../libcmatrix/files/libcmatrix-3.2.1-atlas.patch | 33 --------- |
13 |
.../libcmatrix/files/libcmatrix-3.2.1-shared.patch | 80 ---------------------- |
14 |
2 files changed, 113 deletions(-) |
15 |
|
16 |
diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch |
17 |
deleted file mode 100644 |
18 |
index b10b41d..00000000 |
19 |
--- a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-atlas.patch |
20 |
+++ /dev/null |
21 |
@@ -1,33 +0,0 @@ |
22 |
- configure-libraries.ac | 5 ++++- |
23 |
- 1 files changed, 4 insertions(+), 1 deletions(-) |
24 |
- |
25 |
-diff --git a/configure-libraries.ac b/configure-libraries.ac |
26 |
-index a64e79c..afc75b8 100755 |
27 |
---- a/configure-libraries.ac |
28 |
-+++ b/configure-libraries.ac |
29 |
-@@ -33,6 +33,7 @@ AC_ARG_WITH(atlas, |
30 |
- AS_HELP_STRING([--with-atlas],[use the ATLAS BLAS library (default-use if found)]),,with_atlas=check) |
31 |
- if test x$with_atlas != xno; then |
32 |
- FOUNDATLAS=yes |
33 |
-+ PKG_CHECK_MODULES([ATLAS], [cblas]) |
34 |
- AC_CHECK_HEADERS(cblas.h,,FOUNDATLAS=no |
35 |
- AC_MSG_WARN([ATLAS header files (cblas.h) not found |
36 |
- Is CPPFLAGS is defined to include relevant directory?])) |
37 |
-@@ -40,7 +41,7 @@ Is CPPFLAGS is defined to include relevant directory?])) |
38 |
- AC_MSG_WARN([ATLAS library (libatlas.a) not found |
39 |
- Is LDFLAGS is defined to include relevant directory?])) |
40 |
- if test x$FOUNDATLAS = xyes; then |
41 |
-- LIBS="-lcblas $LIBS" |
42 |
-+ LIBS="$ATLAS_LIBS $LIBS" |
43 |
- CXXFLAGS="$CXXFLAGS -DLCM_USE_EXTERNAL" |
44 |
- else |
45 |
- if test x$with_atlas = xyes; then |
46 |
-@@ -49,6 +50,8 @@ Is LDFLAGS is defined to include relevant directory?])) |
47 |
- fi |
48 |
- fi |
49 |
- |
50 |
-+AC_SUBST(ATLAS_LIBS) |
51 |
-+ |
52 |
- AC_ARG_WITH(acml, |
53 |
- AS_HELP_STRING([--with-acml],[use the ACML BLAS library (default=no)]),,with_acml=no) |
54 |
- if test x$with_acml = xyes; then |
55 |
|
56 |
diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch |
57 |
deleted file mode 100644 |
58 |
index 4e84302..00000000 |
59 |
--- a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-shared.patch |
60 |
+++ /dev/null |
61 |
@@ -1,80 +0,0 @@ |
62 |
-diff --git a/Makefile.in b/Makefile.in |
63 |
-index 1361371..1448e76 100755 |
64 |
---- a/Makefile.in |
65 |
-+++ b/Makefile.in |
66 |
-@@ -13,8 +13,8 @@ AR=@AR@ |
67 |
- |
68 |
- # You shouldn't need to alter anything below here |
69 |
- |
70 |
--COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c |
71 |
--ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG |
72 |
-+COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c |
73 |
-+#ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG |
74 |
- |
75 |
- LOCALOBJS= local/CrystalSystem.o local/CrystalGeneric.o local/MoleculeStructure.o |
76 |
- COREOBJS= coredefs/complex.o coredefs/common.o coredefs/diagonal.o coredefs/diagonalise.o coredefs/power.o coredefs/invert.o coredefs/transforms.o coredefs/blocking.o coredefs/mixed.o coredefs/realtransforms.o coredefs/Chebyshev.o |
77 |
-@@ -36,7 +36,7 @@ ALLTHROBJS=$(UNSAFEOBJS:.o=_r.o) $(ALLSAFEOBJS) |
78 |
- |
79 |
- ROOT=.. |
80 |
- |
81 |
--first: lib/libcmatrix.a |
82 |
-+first: lib/libcmatrix.so.3.2.1 |
83 |
- |
84 |
- #%.o: %.f |
85 |
- # @F77@ @FFLAGS@ -c -o $@ $< |
86 |
-@@ -68,25 +68,25 @@ tempclean: |
87 |
- # -cd optim; @CLEAN@ |
88 |
- # -cd local; @CLEAN@ |
89 |
- |
90 |
--lib/libcmatrix.a: $(ALLNORMOBJS) |
91 |
-- $(AR) $@ $(ALLNORMOBJS) |
92 |
-- chmod a+rx $@ |
93 |
-- $(RANLIB) $@ |
94 |
-- |
95 |
--lib/libcmatrix_p.a: $(ALLPROFOBJS) |
96 |
-- $(AR) $@ $(ALLPROFOBJS) |
97 |
-- chmod a+rx $@ |
98 |
-- $(RANLIB) $@ |
99 |
-- |
100 |
--lib/libcmatrix-g.a: $(ALLGOBJS) |
101 |
-- $(AR) $@ $(ALLGOBJS) |
102 |
-- chmod a+rx $@ |
103 |
-- $(RANLIB) $@ |
104 |
-- |
105 |
--lib/libcmatrix_r.a: $(ALLTHROBJS) |
106 |
-- $(AR) @MTFLAGS@ $@ $(ALLTHROBJS) |
107 |
-- chmod a+rx $@ |
108 |
-- $(RANLIB) $@ |
109 |
-+lib/libcmatrix.so.3.2.1: $(ALLNORMOBJS) |
110 |
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) @ATLAS_LIBS@ |
111 |
-+ ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so.3 |
112 |
-+ ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so |
113 |
-+ |
114 |
-+lib/libcmatrix_p.so.3.2.1: $(ALLPROFOBJS) |
115 |
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) @ATLAS_LIBS@ |
116 |
-+ ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so.3 |
117 |
-+ ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so |
118 |
-+ |
119 |
-+lib/libcmatrix-g.so.3.2.1: $(ALLGOBJS) |
120 |
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) @ATLAS_LIBS@ |
121 |
-+ ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so.3 |
122 |
-+ ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so |
123 |
-+ |
124 |
-+lib/libcmatrix.so_r.3.2.1: $(ALLTHROBJS) |
125 |
-+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) @ATLAS_LIBS@ |
126 |
-+ ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so.3 |
127 |
-+ ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so |
128 |
- |
129 |
- @CONFIGLEAF@××××.gz: |
130 |
- cd $(ROOT) ; tar --exclude lib/* --exclude *.o --exclude=*~ --exclude=Makefile --exclude=include/config.h --exclude=config.status -cvf @CONFIGLEAF@.tar @CONFIGLEAF@ |
131 |
-diff --git a/configure.ac b/configure.ac |
132 |
-index c0ae0e1..50dcd5a 100755 |
133 |
---- a/configure.ac |
134 |
-+++ b/configure.ac |
135 |
-@@ -1,5 +1,6 @@ |
136 |
- AC_INIT(configure.ac) |
137 |
- AC_CONFIG_HEADER(include/config.h) |
138 |
-+LT_INIT |
139 |
- |
140 |
- DEFAR="ar ru" |
141 |
- MAKEEXTRA= |