| 1 |
bicatali 09/01/19 19:22:30 |
| 2 |
|
| 3 |
Added: gsl-1.12-cblas.patch |
| 4 |
Log: |
| 5 |
Version bump. cblas patch adapted and added a check on the external cblas lib not to be gsl itself |
| 6 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/gsl/files/gsl-1.12-cblas.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/files/gsl-1.12-cblas.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gsl/files/gsl-1.12-cblas.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gsl-1.12-cblas.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nur gsl-1.12.orig/acx_cblas.m4 gsl-1.12/acx_cblas.m4 |
| 17 |
--- gsl-1.12.orig/acx_cblas.m4 1970-01-01 01:00:00.000000000 +0100 |
| 18 |
+++ gsl-1.12/acx_cblas.m4 2009-01-19 15:45:43.319918648 +0000 |
| 19 |
@@ -0,0 +1,60 @@ |
| 20 |
+AC_DEFUN([ACX_CBLAS],[ |
| 21 |
+ use_cblas=no |
| 22 |
+ use_cblas_libs="-lcblas -lblas" |
| 23 |
+ use_cblas_cflags="" |
| 24 |
+ |
| 25 |
+ AC_ARG_WITH(cblas, |
| 26 |
+ [AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])]) |
| 27 |
+ |
| 28 |
+ case $with_cblas in |
| 29 |
+ yes) use_cblas=yes ;; |
| 30 |
+ no | "" ) use_cblas=no ;; |
| 31 |
+ -* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;; |
| 32 |
+ *) use_cblas_libs="-l$with_cblas" ;; |
| 33 |
+ esac |
| 34 |
+ |
| 35 |
+ AC_ARG_WITH(cblas-libs, |
| 36 |
+ [AS_HELP_STRING([--with-cblas-libs=<libs>], |
| 37 |
+ [external cblas libraries to link with (default is "$use_cblas_libs")])], |
| 38 |
+ [use_cblas_libs=$withval], []) |
| 39 |
+ |
| 40 |
+ AC_ARG_WITH(cblas-cflags, |
| 41 |
+ [AS_HELP_STRING([--with-cblas-cflags=<flags>], |
| 42 |
+ [extra cflags to compile with external cblas ("-I<dir>")])], |
| 43 |
+ [use_cblas_cflags=$withval], []) |
| 44 |
+ |
| 45 |
+ if test x$use_cblas != xno; then |
| 46 |
+ if test "x$CBLAS_LIBS" = x; then |
| 47 |
+ CBLAS_LIBS="$use_cblas_libs" |
| 48 |
+ fi |
| 49 |
+ if test "x$CBLAS_FLAGS" = x; then |
| 50 |
+ CBLAS_CFLAGS="$use_cblas_cflags" |
| 51 |
+ fi |
| 52 |
+ |
| 53 |
+ CFLAGS_sav="$CFLAGS" |
| 54 |
+ CFLAGS="$CFLAGS $CBLAS_CFLAGS" |
| 55 |
+ AC_CHECK_HEADER(cblas.h, , |
| 56 |
+ [AC_MSG_ERROR([ |
| 57 |
+ *** Header file cblas.h not found. |
| 58 |
+ *** If you installed cblas header in a non standard place, |
| 59 |
+ *** specify its install prefix using the following option |
| 60 |
+ *** --with-cblas-cflags="-I<include_dir>"]) |
| 61 |
+ ]) |
| 62 |
+ CFLAGS="$CFLAGS_sav" |
| 63 |
+ |
| 64 |
+ LIBS_sav="$LIBS" |
| 65 |
+ LIBS="$LIBS $CBLAS_LIBS -lm" |
| 66 |
+ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS]) |
| 67 |
+ AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes], |
| 68 |
+ [AC_MSG_ERROR([ |
| 69 |
+ *** Linking with cblas with $LIBS failed. |
| 70 |
+ *** If you installed cblas library in a non standard place, |
| 71 |
+ *** specify its install prefix using the following option |
| 72 |
+ *** --with-cblas-libs="-L<lib_dir> -l<lib>"]) |
| 73 |
+ ]) |
| 74 |
+ AC_MSG_RESULT($use_cblas) |
| 75 |
+ LIBS="$LIBS_sav" |
| 76 |
+ AC_SUBST(CBLAS_CFLAGS) |
| 77 |
+ AC_SUBST(CBLAS_LIBS) |
| 78 |
+ fi |
| 79 |
+]) |
| 80 |
diff -Nur gsl-1.12.orig/bspline/Makefile.am gsl-1.12/bspline/Makefile.am |
| 81 |
--- gsl-1.12.orig/bspline/Makefile.am 2008-12-08 20:42:50.000000000 +0000 |
| 82 |
+++ gsl-1.12/bspline/Makefile.am 2009-01-19 15:46:59.967091996 +0000 |
| 83 |
@@ -12,6 +12,6 @@ |
| 84 |
|
| 85 |
TESTS = $(check_PROGRAMS) |
| 86 |
|
| 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/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la |
| 88 |
+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 |
| 89 |
|
| 90 |
test_SOURCES = test.c |
| 91 |
diff -Nur gsl-1.12.orig/configure.ac gsl-1.12/configure.ac |
| 92 |
--- gsl-1.12.orig/configure.ac 2008-12-15 14:52:45.000000000 +0000 |
| 93 |
+++ gsl-1.12/configure.ac 2009-01-19 15:45:36.267801871 +0000 |
| 94 |
@@ -169,6 +169,16 @@ |
| 95 |
AC_CHECK_LIB(m, cos) |
| 96 |
fi |
| 97 |
|
| 98 |
+sinclude(acx_cblas.m4) |
| 99 |
+ACX_CBLAS |
| 100 |
+if test "x$CBLAS_LIBS" != "x"; then |
| 101 |
+ CBLAS_LINK_LIBS="$CBLAS_LIBS" |
| 102 |
+else |
| 103 |
+ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la" |
| 104 |
+ CBLAS_LIBS="-lgslcblas" |
| 105 |
+fi |
| 106 |
+AC_SUBST(CBLAS_LINK_LIBS) |
| 107 |
+ |
| 108 |
dnl Remember to put a definition in acconfig.h for each of these |
| 109 |
AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1 |
| 110 |
#include <fenv.h>]) |
| 111 |
diff -Nur gsl-1.12.orig/eigen/Makefile.am gsl-1.12/eigen/Makefile.am |
| 112 |
--- gsl-1.12.orig/eigen/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 113 |
+++ gsl-1.12/eigen/Makefile.am 2009-01-19 15:46:59.999090878 +0000 |
| 114 |
@@ -11,7 +11,7 @@ |
| 115 |
|
| 116 |
TESTS = $(check_PROGRAMS) |
| 117 |
|
| 118 |
-test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la |
| 119 |
+test_LDADD = libgsleigen.la ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la |
| 120 |
|
| 121 |
test_SOURCES = test.c |
| 122 |
|
| 123 |
diff -Nur gsl-1.12.orig/gsl-config.in gsl-1.12/gsl-config.in |
| 124 |
--- gsl-1.12.orig/gsl-config.in 2008-02-05 13:22:10.000000000 +0000 |
| 125 |
+++ gsl-1.12/gsl-config.in 2009-01-19 15:45:06.176046040 +0000 |
| 126 |
@@ -58,11 +58,11 @@ |
| 127 |
;; |
| 128 |
|
| 129 |
--cflags) |
| 130 |
- echo @GSL_CFLAGS@ |
| 131 |
+ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ |
| 132 |
;; |
| 133 |
|
| 134 |
--libs) |
| 135 |
- : ${GSL_CBLAS_LIB=-lgslcblas} |
| 136 |
+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} |
| 137 |
echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm |
| 138 |
;; |
| 139 |
|
| 140 |
diff -Nur gsl-1.12.orig/gsl.pc.in gsl-1.12/gsl.pc.in |
| 141 |
--- gsl-1.12.orig/gsl.pc.in 2008-11-19 09:13:46.000000000 +0000 |
| 142 |
+++ gsl-1.12/gsl.pc.in 2009-01-19 15:45:15.227937645 +0000 |
| 143 |
@@ -6,5 +6,5 @@ |
| 144 |
Name: GSL |
| 145 |
Description: GNU Scientific Library |
| 146 |
Version: @VERSION@ |
| 147 |
-Libs: @GSL_LIBS@ -lgslcblas @LIBS@ |
| 148 |
-Cflags: @GSL_CFLAGS@ |
| 149 |
+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@ |
| 150 |
+Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@ |
| 151 |
diff -Nur gsl-1.12.orig/interpolation/Makefile.am gsl-1.12/interpolation/Makefile.am |
| 152 |
--- gsl-1.12.orig/interpolation/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 153 |
+++ gsl-1.12/interpolation/Makefile.am 2009-01-19 15:47:00.019091996 +0000 |
| 154 |
@@ -10,7 +10,7 @@ |
| 155 |
|
| 156 |
TESTS = $(check_PROGRAMS) |
| 157 |
|
| 158 |
-test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la |
| 159 |
+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.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 |
| 160 |
|
| 161 |
test_SOURCES = test.c |
| 162 |
|
| 163 |
diff -Nur gsl-1.12.orig/linalg/Makefile.am gsl-1.12/linalg/Makefile.am |
| 164 |
--- gsl-1.12.orig/linalg/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 165 |
+++ gsl-1.12/linalg/Makefile.am 2009-01-19 15:47:00.023091716 +0000 |
| 166 |
@@ -12,7 +12,7 @@ |
| 167 |
|
| 168 |
check_PROGRAMS = test |
| 169 |
|
| 170 |
-test_LDADD = 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 |
| 171 |
+test_LDADD = 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 |
| 172 |
|
| 173 |
test_SOURCES = test.c |
| 174 |
|
| 175 |
diff -Nur gsl-1.12.orig/Makefile.am gsl-1.12/Makefile.am |
| 176 |
--- gsl-1.12.orig/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 177 |
+++ gsl-1.12/Makefile.am 2009-01-19 15:45:50.463861656 +0000 |
| 178 |
@@ -17,13 +17,12 @@ |
| 179 |
|
| 180 |
lib_LTLIBRARIES = libgsl.la |
| 181 |
libgsl_la_SOURCES = version.c |
| 182 |
-libgsl_la_LIBADD = $(SUBLIBS) |
| 183 |
+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@ |
| 184 |
libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) |
| 185 |
noinst_HEADERS = templates_on.h templates_off.h build.h |
| 186 |
|
| 187 |
MINGW32_HOST = @MINGW32_HOST@ |
| 188 |
if MINGW32_HOST |
| 189 |
-libgsl_la_LIBADD += cblas/libgslcblas.la |
| 190 |
libgsl_la_LDFLAGS += -no-undefined |
| 191 |
endif |
| 192 |
|
| 193 |
@@ -33,10 +32,10 @@ |
| 194 |
bin_PROGRAMS = gsl-randist gsl-histogram |
| 195 |
|
| 196 |
gsl_randist_SOURCES = gsl-randist.c |
| 197 |
-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la |
| 198 |
+gsl_randist_LDADD = libgsl.la |
| 199 |
|
| 200 |
gsl_histogram_SOURCES = gsl-histogram.c |
| 201 |
-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la |
| 202 |
+gsl_histogram_LDADD = libgsl.la |
| 203 |
|
| 204 |
check_SCRIPTS = test_gsl_histogram.sh |
| 205 |
TESTS = test_gsl_histogram.sh |
| 206 |
diff -Nur gsl-1.12.orig/multifit/Makefile.am gsl-1.12/multifit/Makefile.am |
| 207 |
--- gsl-1.12.orig/multifit/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 208 |
+++ gsl-1.12/multifit/Makefile.am 2009-01-19 15:47:00.031091716 +0000 |
| 209 |
@@ -13,8 +13,8 @@ |
| 210 |
TESTS = $(check_PROGRAMS) |
| 211 |
|
| 212 |
test_SOURCES = test.c |
| 213 |
-test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la |
| 214 |
+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la |
| 215 |
|
| 216 |
#demo_SOURCES = demo.c |
| 217 |
-#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 |
| 218 |
+#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 |
| 219 |
|
| 220 |
diff -Nur gsl-1.12.orig/multimin/Makefile.am gsl-1.12/multimin/Makefile.am |
| 221 |
--- gsl-1.12.orig/multimin/Makefile.am 2008-11-29 17:51:18.000000000 +0000 |
| 222 |
+++ gsl-1.12/multimin/Makefile.am 2009-01-19 15:47:00.035091996 +0000 |
| 223 |
@@ -13,8 +13,8 @@ |
| 224 |
TESTS = $(check_PROGRAMS) |
| 225 |
|
| 226 |
test_SOURCES = test.c test_funcs.c test_funcs.h |
| 227 |
-test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.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 |
| 228 |
+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.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 |
| 229 |
|
| 230 |
#demo_SOURCES = demo.c |
| 231 |
-#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 |
| 232 |
+#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 |
| 233 |
|
| 234 |
diff -Nur gsl-1.12.orig/multiroots/Makefile.am gsl-1.12/multiroots/Makefile.am |
| 235 |
--- gsl-1.12.orig/multiroots/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 236 |
+++ gsl-1.12/multiroots/Makefile.am 2009-01-19 15:47:00.035091996 +0000 |
| 237 |
@@ -15,5 +15,5 @@ |
| 238 |
TESTS = $(check_PROGRAMS) |
| 239 |
|
| 240 |
test_SOURCES = test.c test_funcs.c test_funcs.h |
| 241 |
-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 |
| 242 |
+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 |
| 243 |
|
| 244 |
diff -Nur gsl-1.12.orig/ode-initval/Makefile.am gsl-1.12/ode-initval/Makefile.am |
| 245 |
--- gsl-1.12.orig/ode-initval/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 246 |
+++ gsl-1.12/ode-initval/Makefile.am 2009-01-19 15:47:00.039090878 +0000 |
| 247 |
@@ -12,7 +12,7 @@ |
| 248 |
|
| 249 |
TESTS = $(check_PROGRAMS) |
| 250 |
|
| 251 |
-test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.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 |
| 252 |
+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.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 |
|
| 254 |
test_SOURCES = test.c |
| 255 |
|
| 256 |
diff -Nur gsl-1.12.orig/poly/Makefile.am gsl-1.12/poly/Makefile.am |
| 257 |
--- gsl-1.12.orig/poly/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 258 |
+++ gsl-1.12/poly/Makefile.am 2009-01-19 15:47:00.047090599 +0000 |
| 259 |
@@ -10,7 +10,7 @@ |
| 260 |
|
| 261 |
TESTS = $(check_PROGRAMS) |
| 262 |
|
| 263 |
-check_PROGRAMS = test |
| 264 |
+#check_PROGRAMS = test |
| 265 |
|
| 266 |
test_SOURCES = test.c |
| 267 |
test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la |
| 268 |
diff -Nur gsl-1.12.orig/specfunc/Makefile.am gsl-1.12/specfunc/Makefile.am |
| 269 |
--- gsl-1.12.orig/specfunc/Makefile.am 2008-11-27 20:03:28.000000000 +0000 |
| 270 |
+++ gsl-1.12/specfunc/Makefile.am 2009-01-19 15:47:00.063090599 +0000 |
| 271 |
@@ -12,7 +12,7 @@ |
| 272 |
|
| 273 |
check_PROGRAMS = test |
| 274 |
|
| 275 |
-test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la |
| 276 |
+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la |
| 277 |
|
| 278 |
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 |
| 279 |
|
| 280 |
diff -Nur gsl-1.12.orig/wavelet/Makefile.am gsl-1.12/wavelet/Makefile.am |
| 281 |
--- gsl-1.12.orig/wavelet/Makefile.am 2008-11-27 20:03:29.000000000 +0000 |
| 282 |
+++ gsl-1.12/wavelet/Makefile.am 2009-01-19 15:47:00.163091437 +0000 |
| 283 |
@@ -10,7 +10,7 @@ |
| 284 |
|
| 285 |
TESTS = $(check_PROGRAMS) |
| 286 |
|
| 287 |
-test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la |
| 288 |
+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la |
| 289 |
|
| 290 |
test_SOURCES = test.c |
Archives