1 Changes needed to use Studio libsunperf on Solaris (if available). |
1 Changes needed to use Studio libsunperf on Solaris (if available). |
2 |
2 |
3 These changes will be sent upstream. |
3 These changes will be sent upstream. |
4 |
4 |
5 --- gsl-2.1/configure.ac.orig 2015-12-04 10:22:53.164659106 -0800 |
5 --- gsl-2.2.1/configure.ac.orig 2016-11-28 09:04:10.000000000 +0000 |
6 +++ gsl-2.1/configure.ac 2015-12-04 10:22:33.120473949 -0800 |
6 +++ gsl-2.2.1/configure.ac 2016-11-28 09:03:51.000000000 +0000 |
7 @@ -109,6 +109,20 @@ |
7 @@ -111,6 +111,20 @@ |
8 AC_C_INLINE |
8 AC_C_INLINE |
9 AC_C_CHAR_UNSIGNED |
9 AC_C_CHAR_UNSIGNED |
10 |
10 |
11 +dnl Check for existing BLAS |
11 +dnl Check for existing BLAS |
12 +dnl look for BLAS in some typical places |
12 +dnl look for BLAS in some typical places |
23 +esac |
23 +esac |
24 + |
24 + |
25 GSL_CFLAGS="-I$includedir" |
25 GSL_CFLAGS="-I$includedir" |
26 GSL_LIBS="-L$libdir -lgsl" |
26 GSL_LIBS="-L$libdir -lgsl" |
27 dnl macro from libtool - can be replaced with LT_LIB_M when we require libtool 2 |
27 dnl macro from libtool - can be replaced with LT_LIB_M when we require libtool 2 |
28 --- gsl-2.1/Makefile.am.orig 2015-12-04 10:25:17.763607999 -0800 |
28 --- gsl-2.2.1/Makefile.am.orig 2016-11-28 09:04:30.000000000 +0000 |
29 +++ gsl-2.1/Makefile.am 2015-12-04 10:27:53.909148289 -0800 |
29 +++ gsl-2.2.1/Makefile.am 2016-11-30 08:35:26.586505711 +0000 |
30 @@ -2,7 +2,14 @@ |
30 @@ -2,7 +2,14 @@ |
31 |
31 |
32 # AUTOMAKE_OPTIONS = readme-alpha |
32 # AUTOMAKE_OPTIONS = readme-alpha |
33 |
33 |
34 -SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multilarge rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc |
34 -SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multifit_nlinear multilarge multilarge_nlinear rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc |
35 +SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils $(CBLAS_DIRS) blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multilarge rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc |
35 +SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils $(CBLAS_DIRS) blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multifit_nlinear multilarge multilarge_nlinear rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc |
36 + |
36 + |
37 +SOLARIS_SUNPERF = @SOLARIS_SUNPERF@ |
37 +SOLARIS_SUNPERF = @SOLARIS_SUNPERF@ |
38 +if SOLARIS_SUNPERF |
38 +if SOLARIS_SUNPERF |
39 + CBLAS_DIRS= |
39 + CBLAS_DIRS= |
40 +else |
40 +else |
41 + CBLAS_DIRS=cblas |
41 + CBLAS_DIRS=cblas |
42 +endif |
42 +endif |
43 |
43 |
44 SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multilarge/libgslmultilarge.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la ode-initval2/libgslodeiv2.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la rstat/libgslrstat.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la spmatrix/libgslspmatrix.la spblas/libgslspblas.la splinalg/libgslsplinalg.la |
44 SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multifit_nlinear/libgslmultifit_nlinear.la multilarge/libgslmultilarge.la multilarge_nlinear/libgslmultilarge_nlinear.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la ode-initval2/libgslodeiv2.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la rstat/libgslrstat.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la spmatrix/libgslspmatrix.la spblas/libgslspblas.la splinalg/libgslsplinalg.la |
45 |
45 |
46 @@ -29,10 +36,16 @@ |
46 @@ -29,10 +36,18 @@ |
47 bin_PROGRAMS = gsl-randist gsl-histogram |
47 bin_PROGRAMS = gsl-randist gsl-histogram |
48 |
48 |
49 gsl_randist_SOURCES = gsl-randist.c |
49 gsl_randist_SOURCES = gsl-randist.c |
50 -gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la |
50 +if SOLARIS_SUNPERF |
|
51 +gsl_randist_LDADD = libgsl.la |
|
52 +else |
|
53 gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la |
|
54 +endif |
51 |
55 |
52 gsl_histogram_SOURCES = gsl-histogram.c |
56 gsl_histogram_SOURCES = gsl-histogram.c |
53 + |
|
54 +if SOLARIS_SUNPERF |
57 +if SOLARIS_SUNPERF |
55 +gsl_randist_LDADD = libgsl.la |
|
56 +gsl_histogram_LDADD = libgsl.la |
58 +gsl_histogram_LDADD = libgsl.la |
57 +else |
59 +else |
58 +gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la |
|
59 gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la |
60 gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la |
60 +endif |
61 +endif |
61 |
62 |
62 check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test |
63 check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test |
63 TESTS = test_gsl_histogram.sh pkgconfig.test |
64 TESTS = test_gsl_histogram.sh pkgconfig.test |