Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 246521 | Differences between
and this patch

Collapse All | Expand All

(-)gsl-1.12.orig/acx_cblas.m4 (+60 lines)
Line 0 Link Here
1
AC_DEFUN([ACX_CBLAS],[
2
  use_cblas=no
3
  use_cblas_libs="-L/opt/intel/mkl/10.0.5.025/lib/32 -liomp5 -lpthread -lcblas -lblas"
4
  use_cblas_cflags=""
5
6
  AC_ARG_WITH(cblas,
7
	[AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])])
8
9
  case $with_cblas in
10
	yes) use_cblas=yes ;;
11
	no | "" ) use_cblas=no ;;
12
	-* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;;
13
	*) use_cblas_libs="-l$with_cblas" ;;
14
  esac
15
16
  AC_ARG_WITH(cblas-libs,
17
	[AS_HELP_STRING([--with-cblas-libs=<libs>],
18
	 [external cblas libraries to link with (default is "$use_cblas_libs")])],
19
	[use_cblas_libs=$withval], [])
20
21
  AC_ARG_WITH(cblas-cflags,
22
	[AS_HELP_STRING([--with-cblas-cflags=<flags>],
23
	 [extra cflags to compile with external cblas ("-I<dir>")])],
24
	[use_cblas_cflags=$withval], [])
25
26
  if test x$use_cblas != xno; then
27
	if test "x$CBLAS_LIBS" = x; then
28
		CBLAS_LIBS="$use_cblas_libs"
29
     	fi
30
     	if test "x$CBLAS_FLAGS" = x; then
31
       		CBLAS_CFLAGS="$use_cblas_cflags"
32
   	fi
33
34
   	CFLAGS_sav="$CFLAGS"
35
   	CFLAGS="$CFLAGS $CBLAS_CFLAGS"
36
   	AC_CHECK_HEADER(cblas.h, ,
37
		[AC_MSG_ERROR([
38
	   	*** Header file cblas.h not found.
39
	   	*** If you installed cblas header in a non standard place,
40
	   	*** specify its install prefix using the following option
41
	   	***  --with-cblas-cflags="-I<include_dir>"])
42
	 	])
43
   	CFLAGS="$CFLAGS_sav"
44
45
   	LIBS_sav="$LIBS"
46
   	LIBS="$LIBS $CBLAS_LIBS -lm"
47
   	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
48
   	AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes],
49
    		[AC_MSG_ERROR([
50
	    	*** Linking with cblas with $LIBS failed.
51
       	    	*** If you installed cblas library in a non standard place,
52
   	    	*** specify its install prefix using the following option
53
	    	***  --with-cblas-libs="-L<lib_dir> -l<lib>"])
54
	 	])
55
   	AC_MSG_RESULT($use_cblas)
56
   	LIBS="$LIBS_sav"
57
	AC_SUBST(CBLAS_CFLAGS)
58
	AC_SUBST(CBLAS_LIBS)
59
 fi
60
])
(-)gsl-1.12.orig/bspline/Makefile.am (-1 / +1 lines)
Lines 12-17 Link Here
12
12
13
TESTS = $(check_PROGRAMS)
13
TESTS = $(check_PROGRAMS)
14
14
15
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
15
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
16
16
17
test_SOURCES = test.c
17
test_SOURCES = test.c
(-)gsl-1.12.orig/configure.ac (+10 lines)
Lines 169-174 Link Here
169
  AC_CHECK_LIB(m, cos)
169
  AC_CHECK_LIB(m, cos)
170
fi
170
fi
171
171
172
sinclude(acx_cblas.m4)
173
ACX_CBLAS
174
if test "x$CBLAS_LIBS" != "x"; then
175
   CBLAS_LINK_LIBS="$CBLAS_LIBS"
176
else
177
   CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
178
   CBLAS_LIBS="-lgslcblas"
179
fi
180
AC_SUBST(CBLAS_LINK_LIBS)
181
172
dnl Remember to put a definition in acconfig.h for each of these
182
dnl Remember to put a definition in acconfig.h for each of these
173
AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
183
AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
174
#include <fenv.h>]) 
184
#include <fenv.h>]) 
(-)gsl-1.12.orig/eigen/Makefile.am (-1 / +1 lines)
Lines 11-17 Link Here
11
11
12
TESTS = $(check_PROGRAMS)
12
TESTS = $(check_PROGRAMS)
13
13
14
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
14
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
15
15
16
test_SOURCES = test.c
16
test_SOURCES = test.c
17
17
(-)gsl-1.12.orig/gsl-config.in (-2 / +2 lines)
Lines 58-68 Link Here
58
	;;
58
	;;
59
59
60
    --cflags)
60
    --cflags)
61
       	echo @GSL_CFLAGS@ 
61
       	echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
62
       	;;
62
       	;;
63
63
64
    --libs)
64
    --libs)
65
        : ${GSL_CBLAS_LIB=-lgslcblas}
65
        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
66
       	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm
66
       	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm
67
       	;;
67
       	;;
68
68
(-)gsl-1.12.orig/gsl.pc.in (-2 / +2 lines)
Lines 6-10 Link Here
6
Name: GSL
6
Name: GSL
7
Description: GNU Scientific Library
7
Description: GNU Scientific Library
8
Version: @VERSION@
8
Version: @VERSION@
9
Libs: @GSL_LIBS@ -lgslcblas @LIBS@
9
Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@
10
Cflags: @GSL_CFLAGS@
10
Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@
(-)gsl-1.12.orig/interpolation/Makefile.am (-1 / +1 lines)
Lines 10-16 Link Here
10
10
11
TESTS = $(check_PROGRAMS)
11
TESTS = $(check_PROGRAMS)
12
12
13
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
13
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
14
14
15
test_SOURCES = test.c
15
test_SOURCES = test.c
16
16
(-)gsl-1.12.orig/linalg/Makefile.am (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
check_PROGRAMS = test
13
check_PROGRAMS = test
14
14
15
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
15
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
16
16
17
test_SOURCES = test.c
17
test_SOURCES = test.c
18
18
(-)gsl-1.12.orig/Makefile.am (-4 / +3 lines)
Lines 17-29 Link Here
17
17
18
lib_LTLIBRARIES = libgsl.la
18
lib_LTLIBRARIES = libgsl.la
19
libgsl_la_SOURCES = version.c
19
libgsl_la_SOURCES = version.c
20
libgsl_la_LIBADD = $(SUBLIBS)
20
libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
21
libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
21
libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
22
noinst_HEADERS = templates_on.h templates_off.h build.h
22
noinst_HEADERS = templates_on.h templates_off.h build.h
23
23
24
MINGW32_HOST = @MINGW32_HOST@
24
MINGW32_HOST = @MINGW32_HOST@
25
if MINGW32_HOST
25
if MINGW32_HOST
26
libgsl_la_LIBADD += cblas/libgslcblas.la
27
libgsl_la_LDFLAGS += -no-undefined
26
libgsl_la_LDFLAGS += -no-undefined
28
endif
27
endif
29
28
Lines 33-42 Link Here
33
bin_PROGRAMS = gsl-randist gsl-histogram
32
bin_PROGRAMS = gsl-randist gsl-histogram
34
33
35
gsl_randist_SOURCES = gsl-randist.c
34
gsl_randist_SOURCES = gsl-randist.c
36
gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
35
gsl_randist_LDADD = libgsl.la
37
36
38
gsl_histogram_SOURCES = gsl-histogram.c
37
gsl_histogram_SOURCES = gsl-histogram.c
39
gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
38
gsl_histogram_LDADD = libgsl.la
40
39
41
check_SCRIPTS = test_gsl_histogram.sh
40
check_SCRIPTS = test_gsl_histogram.sh
42
TESTS = test_gsl_histogram.sh
41
TESTS = test_gsl_histogram.sh
(-)gsl-1.12.orig/multifit/Makefile.am (-2 / +2 lines)
Lines 13-20 Link Here
13
TESTS = $(check_PROGRAMS)
13
TESTS = $(check_PROGRAMS)
14
14
15
test_SOURCES = test.c
15
test_SOURCES = test.c
16
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
16
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
17
17
18
#demo_SOURCES = demo.c
18
#demo_SOURCES = demo.c
19
#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
19
#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
20
20
(-)gsl-1.12.orig/multimin/Makefile.am (-2 / +2 lines)
Lines 13-20 Link Here
13
TESTS = $(check_PROGRAMS) 
13
TESTS = $(check_PROGRAMS) 
14
14
15
test_SOURCES = test.c test_funcs.c test_funcs.h
15
test_SOURCES = test.c test_funcs.c test_funcs.h
16
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
16
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
17
17
18
#demo_SOURCES = demo.c 
18
#demo_SOURCES = demo.c 
19
#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
19
#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
20
20
(-)gsl-1.12.orig/multiroots/Makefile.am (-1 / +1 lines)
Lines 15-19 Link Here
15
TESTS = $(check_PROGRAMS)
15
TESTS = $(check_PROGRAMS)
16
16
17
test_SOURCES = test.c test_funcs.c test_funcs.h
17
test_SOURCES = test.c test_funcs.c test_funcs.h
18
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
18
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
19
19
(-)gsl-1.12.orig/ode-initval/Makefile.am (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
TESTS = $(check_PROGRAMS)
13
TESTS = $(check_PROGRAMS)
14
14
15
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 
15
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 
16
16
17
test_SOURCES = test.c
17
test_SOURCES = test.c
18
18
(-)gsl-1.12.orig/poly/Makefile.am (-1 / +1 lines)
Lines 10-16 Link Here
10
10
11
TESTS = $(check_PROGRAMS)
11
TESTS = $(check_PROGRAMS)
12
12
13
check_PROGRAMS = test
13
#check_PROGRAMS = test
14
14
15
test_SOURCES = test.c
15
test_SOURCES = test.c
16
test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
16
test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
(-)gsl-1.12.orig/specfunc/Makefile.am (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
check_PROGRAMS = test
13
check_PROGRAMS = test
14
14
15
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
15
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
16
16
17
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
17
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
18
  
18
  
(-)gsl-1.12.orig/wavelet/Makefile.am (-1 / +1 lines)
Lines 10-16 Link Here
10
10
11
TESTS = $(check_PROGRAMS)
11
TESTS = $(check_PROGRAMS)
12
12
13
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
13
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
14
14
15
test_SOURCES = test.c
15
test_SOURCES = test.c
16
16

Return to bug 246521