Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/gsl/files: gsl-1.15-cblas.patch
Date: Thu, 28 Jul 2011 22:02:42
Message-Id: 20110728212926.D515820051@flycatcher.gentoo.org
1 bicatali 11/07/28 21:29:26
2
3 Modified: gsl-1.15-cblas.patch
4 Log:
5 Adapated cblas patch to respect upstream policy about pkg-config, fixing tests (bug #370317)
6
7 (Portage version: 2.1.10.7/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 sci-libs/gsl/files/gsl-1.15-cblas.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gsl/files/gsl-1.15-cblas.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gsl/files/gsl-1.15-cblas.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gsl/files/gsl-1.15-cblas.patch?r1=1.1&r2=1.2
15
16 Index: gsl-1.15-cblas.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-libs/gsl/files/gsl-1.15-cblas.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- gsl-1.15-cblas.patch 21 May 2011 10:18:03 -0000 1.1
23 +++ gsl-1.15-cblas.patch 28 Jul 2011 21:29:26 -0000 1.2
24 @@ -1,46 +1,6 @@
25 -diff -Naur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
26 ---- gsl-1.15.orig/Makefile.am 2011-05-21 11:49:07.000000000 +0200
27 -+++ gsl-1.15/Makefile.am 2011-05-21 11:49:28.000000000 +0200
28 -@@ -19,13 +19,12 @@
29 -
30 - lib_LTLIBRARIES = libgsl.la
31 - libgsl_la_SOURCES = version.c
32 --libgsl_la_LIBADD = $(SUBLIBS)
33 -+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
34 - libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
35 - noinst_HEADERS = templates_on.h templates_off.h build.h
36 -
37 - MINGW32_HOST = @MINGW32_HOST@
38 - if MINGW32_HOST
39 --libgsl_la_LIBADD += cblas/libgslcblas.la
40 - libgsl_la_LDFLAGS += -no-undefined
41 - endif
42 -
43 -@@ -35,10 +34,10 @@
44 - bin_PROGRAMS = gsl-randist gsl-histogram
45 -
46 - gsl_randist_SOURCES = gsl-randist.c
47 --gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
48 -+gsl_randist_LDADD = libgsl.la
49 -
50 - gsl_histogram_SOURCES = gsl-histogram.c
51 --gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
52 -+gsl_histogram_LDADD = libgsl.la
53 -
54 - check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
55 - TESTS = test_gsl_histogram.sh pkgconfig.test
56 -@@ -57,6 +56,8 @@
57 - -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
58 - -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
59 - -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
60 -+ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
61 -+ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
62 - -e 's|@LIBS[@]|$(LIBS)|g' \
63 - -e 's|@VERSION[@]|$(VERSION)|g'
64 -
65 -diff -Naur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
66 +diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
67 --- gsl-1.15.orig/acx_cblas.m4 1970-01-01 01:00:00.000000000 +0100
68 -+++ gsl-1.15/acx_cblas.m4 2011-05-21 11:49:28.000000000 +0200
69 ++++ gsl-1.15/acx_cblas.m4 2011-07-28 22:16:03.000000000 +0100
70 @@ -0,0 +1,60 @@
71 +AC_DEFUN([ACX_CBLAS],[
72 + use_cblas=no
73 @@ -102,9 +62,9 @@
74 + AC_SUBST(CBLAS_LIBS)
75 + fi
76 +])
77 -diff -Naur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
78 ---- gsl-1.15.orig/bspline/Makefile.am 2011-05-21 11:49:07.000000000 +0200
79 -+++ gsl-1.15/bspline/Makefile.am 2011-05-21 11:49:28.000000000 +0200
80 +diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
81 +--- gsl-1.15.orig/bspline/Makefile.am 2011-07-28 22:15:49.000000000 +0100
82 ++++ gsl-1.15/bspline/Makefile.am 2011-07-28 22:16:03.000000000 +0100
83 @@ -12,6 +12,6 @@
84
85 TESTS = $(check_PROGRAMS)
86 @@ -113,9 +73,9 @@
87 +test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
88
89 test_SOURCES = test.c
90 -diff -Naur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
91 ---- gsl-1.15.orig/configure.ac 2011-05-21 11:49:07.000000000 +0200
92 -+++ gsl-1.15/configure.ac 2011-05-21 11:49:28.000000000 +0200
93 +diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
94 +--- gsl-1.15.orig/configure.ac 2011-07-28 22:15:49.000000000 +0100
95 ++++ gsl-1.15/configure.ac 2011-07-28 22:16:03.000000000 +0100
96 @@ -190,6 +190,16 @@
97 AC_CHECK_LIB(m, cos)
98 fi
99 @@ -133,9 +93,9 @@
100 dnl Remember to put a definition in acconfig.h for each of these
101 AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
102 #include <fenv.h>])
103 -diff -Naur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
104 ---- gsl-1.15.orig/eigen/Makefile.am 2011-05-21 11:49:07.000000000 +0200
105 -+++ gsl-1.15/eigen/Makefile.am 2011-05-21 11:49:28.000000000 +0200
106 +diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
107 +--- gsl-1.15.orig/eigen/Makefile.am 2011-07-28 22:15:49.000000000 +0100
108 ++++ gsl-1.15/eigen/Makefile.am 2011-07-28 22:16:03.000000000 +0100
109 @@ -11,7 +11,7 @@
110
111 TESTS = $(check_PROGRAMS)
112 @@ -145,9 +105,9 @@
113
114 test_SOURCES = test.c
115
116 -diff -Naur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
117 ---- gsl-1.15.orig/gsl-config.in 2011-05-21 11:49:07.000000000 +0200
118 -+++ gsl-1.15/gsl-config.in 2011-05-21 11:52:29.000000000 +0200
119 +diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
120 +--- gsl-1.15.orig/gsl-config.in 2011-07-28 22:15:49.000000000 +0100
121 ++++ gsl-1.15/gsl-config.in 2011-07-28 22:16:03.000000000 +0100
122 @@ -58,11 +58,11 @@
123 ;;
124
125 @@ -162,25 +122,21 @@
126 echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
127 ;;
128
129 -diff -Naur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
130 ---- gsl-1.15.orig/gsl.pc.in 2011-05-21 11:49:07.000000000 +0200
131 -+++ gsl-1.15/gsl.pc.in 2011-05-21 11:53:47.000000000 +0200
132 -@@ -2,10 +2,9 @@
133 +diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
134 +--- gsl-1.15.orig/gsl.pc.in 2011-07-28 22:15:49.000000000 +0100
135 ++++ gsl-1.15/gsl.pc.in 2011-07-28 22:20:14.000000000 +0100
136 +@@ -2,7 +2,7 @@
137 exec_prefix=@exec_prefix@
138 libdir=@libdir@
139 includedir=@includedir@
140 -GSL_CBLAS_LIB=-lgslcblas
141 ++GSL_CBLAS_LIB=@CBLAS_LIBS@
142
143 Name: GSL
144 Description: GNU Scientific Library
145 - Version: @VERSION@
146 --Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
147 --Cflags: @GSL_CFLAGS@
148 -+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @GSL_LIBM@ @LIBS@
149 -+Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@
150 -diff -Naur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
151 ---- gsl-1.15.orig/interpolation/Makefile.am 2011-05-21 11:49:07.000000000 +0200
152 -+++ gsl-1.15/interpolation/Makefile.am 2011-05-21 11:49:28.000000000 +0200
153 +diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
154 +--- gsl-1.15.orig/interpolation/Makefile.am 2011-07-28 22:15:49.000000000 +0100
155 ++++ gsl-1.15/interpolation/Makefile.am 2011-07-28 22:16:03.000000000 +0100
156 @@ -10,7 +10,7 @@
157
158 TESTS = $(check_PROGRAMS)
159 @@ -190,9 +146,9 @@
160
161 test_SOURCES = test.c
162
163 -diff -Naur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
164 ---- gsl-1.15.orig/linalg/Makefile.am 2011-05-21 11:49:07.000000000 +0200
165 -+++ gsl-1.15/linalg/Makefile.am 2011-05-21 11:49:28.000000000 +0200
166 +diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
167 +--- gsl-1.15.orig/linalg/Makefile.am 2011-07-28 22:15:49.000000000 +0100
168 ++++ gsl-1.15/linalg/Makefile.am 2011-07-28 22:16:03.000000000 +0100
169 @@ -12,7 +12,7 @@
170
171 check_PROGRAMS = test
172 @@ -202,9 +158,49 @@
173
174 test_SOURCES = test.c
175
176 -diff -Naur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
177 ---- gsl-1.15.orig/multifit/Makefile.am 2011-05-21 11:49:07.000000000 +0200
178 -+++ gsl-1.15/multifit/Makefile.am 2011-05-21 11:49:28.000000000 +0200
179 +diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
180 +--- gsl-1.15.orig/Makefile.am 2011-07-28 22:15:49.000000000 +0100
181 ++++ gsl-1.15/Makefile.am 2011-07-28 22:16:03.000000000 +0100
182 +@@ -19,13 +19,12 @@
183 +
184 + lib_LTLIBRARIES = libgsl.la
185 + libgsl_la_SOURCES = version.c
186 +-libgsl_la_LIBADD = $(SUBLIBS)
187 ++libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
188 + libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
189 + noinst_HEADERS = templates_on.h templates_off.h build.h
190 +
191 + MINGW32_HOST = @MINGW32_HOST@
192 + if MINGW32_HOST
193 +-libgsl_la_LIBADD += cblas/libgslcblas.la
194 + libgsl_la_LDFLAGS += -no-undefined
195 + endif
196 +
197 +@@ -35,10 +34,10 @@
198 + bin_PROGRAMS = gsl-randist gsl-histogram
199 +
200 + gsl_randist_SOURCES = gsl-randist.c
201 +-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
202 ++gsl_randist_LDADD = libgsl.la
203 +
204 + gsl_histogram_SOURCES = gsl-histogram.c
205 +-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
206 ++gsl_histogram_LDADD = libgsl.la
207 +
208 + check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
209 + TESTS = test_gsl_histogram.sh pkgconfig.test
210 +@@ -57,6 +56,8 @@
211 + -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
212 + -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
213 + -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
214 ++ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
215 ++ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
216 + -e 's|@LIBS[@]|$(LIBS)|g' \
217 + -e 's|@VERSION[@]|$(VERSION)|g'
218 +
219 +diff -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
220 +--- gsl-1.15.orig/multifit/Makefile.am 2011-07-28 22:15:49.000000000 +0100
221 ++++ gsl-1.15/multifit/Makefile.am 2011-07-28 22:16:03.000000000 +0100
222 @@ -13,8 +13,8 @@
223 TESTS = $(check_PROGRAMS)
224
225 @@ -216,9 +212,9 @@
226 -#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
227 +#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
228
229 -diff -Naur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
230 ---- gsl-1.15.orig/multimin/Makefile.am 2011-05-21 11:49:07.000000000 +0200
231 -+++ gsl-1.15/multimin/Makefile.am 2011-05-21 11:49:28.000000000 +0200
232 +diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
233 +--- gsl-1.15.orig/multimin/Makefile.am 2011-07-28 22:15:49.000000000 +0100
234 ++++ gsl-1.15/multimin/Makefile.am 2011-07-28 22:16:03.000000000 +0100
235 @@ -13,8 +13,8 @@
236 TESTS = $(check_PROGRAMS)
237
238 @@ -230,9 +226,9 @@
239 -#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
240 +#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
241
242 -diff -Naur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
243 ---- gsl-1.15.orig/multiroots/Makefile.am 2011-05-21 11:49:07.000000000 +0200
244 -+++ gsl-1.15/multiroots/Makefile.am 2011-05-21 11:49:28.000000000 +0200
245 +diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
246 +--- gsl-1.15.orig/multiroots/Makefile.am 2011-07-28 22:15:49.000000000 +0100
247 ++++ gsl-1.15/multiroots/Makefile.am 2011-07-28 22:16:03.000000000 +0100
248 @@ -15,5 +15,5 @@
249 TESTS = $(check_PROGRAMS)
250
251 @@ -240,9 +236,9 @@
252 -test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
253 +test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
254
255 -diff -Naur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
256 ---- gsl-1.15.orig/ode-initval/Makefile.am 2011-05-21 11:49:07.000000000 +0200
257 -+++ gsl-1.15/ode-initval/Makefile.am 2011-05-21 11:49:28.000000000 +0200
258 +diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
259 +--- gsl-1.15.orig/ode-initval/Makefile.am 2011-07-28 22:15:49.000000000 +0100
260 ++++ gsl-1.15/ode-initval/Makefile.am 2011-07-28 22:16:03.000000000 +0100
261 @@ -12,7 +12,7 @@
262
263 TESTS = $(check_PROGRAMS)
264 @@ -252,9 +248,9 @@
265
266 test_SOURCES = test.c
267
268 -diff -Naur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
269 ---- gsl-1.15.orig/poly/Makefile.am 2011-05-21 11:49:07.000000000 +0200
270 -+++ gsl-1.15/poly/Makefile.am 2011-05-21 11:49:28.000000000 +0200
271 +diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
272 +--- gsl-1.15.orig/poly/Makefile.am 2011-07-28 22:15:49.000000000 +0100
273 ++++ gsl-1.15/poly/Makefile.am 2011-07-28 22:16:03.000000000 +0100
274 @@ -10,7 +10,7 @@
275
276 TESTS = $(check_PROGRAMS)
277 @@ -264,9 +260,9 @@
278
279 test_SOURCES = test.c
280 test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
281 -diff -Naur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
282 ---- gsl-1.15.orig/specfunc/Makefile.am 2011-05-21 11:49:07.000000000 +0200
283 -+++ gsl-1.15/specfunc/Makefile.am 2011-05-21 11:49:28.000000000 +0200
284 +diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
285 +--- gsl-1.15.orig/specfunc/Makefile.am 2011-07-28 22:15:49.000000000 +0100
286 ++++ gsl-1.15/specfunc/Makefile.am 2011-07-28 22:16:03.000000000 +0100
287 @@ -12,7 +12,7 @@
288
289 check_PROGRAMS = test
290 @@ -276,9 +272,9 @@
291
292 test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
293
294 -diff -Naur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
295 ---- gsl-1.15.orig/wavelet/Makefile.am 2011-05-21 11:49:07.000000000 +0200
296 -+++ gsl-1.15/wavelet/Makefile.am 2011-05-21 11:49:28.000000000 +0200
297 +diff -Nur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
298 +--- gsl-1.15.orig/wavelet/Makefile.am 2011-07-28 22:15:49.000000000 +0100
299 ++++ gsl-1.15/wavelet/Makefile.am 2011-07-28 22:16:03.000000000 +0100
300 @@ -10,7 +10,7 @@
301
302 TESTS = $(check_PROGRAMS)