author | pkidd <patrick.kidd@oracle.com> |
Wed, 27 Jan 2016 12:14:36 -0800 | |
branch | s11u3-sru |
changeset 5354 | f2f3e6f8b341 |
parent 4177 | 403051808966 |
child 5250 | 3b05aeef75e3 |
permissions | -rw-r--r-- |
4138
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Changes needed to use Studio libsunperf on Solaris (if available). |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
These changes will be sent upstream. |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- gsl-1.16/configure.ac.orig 2014-05-16 05:57:01.088210548 -0700 |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ gsl-1.16/configure.ac 2015-04-10 11:57:45.589459045 -0700 |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -101,6 +101,20 @@ |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
AC_C_INLINE |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
AC_C_CHAR_UNSIGNED |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
+dnl Check for existing BLAS |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+dnl look for BLAS in some typical places |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+AM_CONDITIONAL(SOLARIS_SUNPERF, false) |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
+case "$host" in |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+*-*-solaris*) |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
+ AC_CHECK_LIB(sunperf,dcopy,BLAS=-lsunperf) |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
+ if test "$BLAS"; then |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
+ dnl Solaris BLAS library has performance benefits |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
+ AM_CONDITIONAL(SOLARIS_SUNPERF, true) |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
+ CFLAGS="-xlibmopt -xbuiltin=%default -xlibmil" |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+ fi |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
+ ;; |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
+esac |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
+ |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
GSL_CFLAGS="-I$includedir" |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
GSL_LIBS="-L$libdir -lgsl" |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
dnl macro from libtool - can be replaced with LT_LIB_M when we require libtool 2 |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
--- gsl-1.16/Makefile.am.orig 2014-05-16 06:23:30.414886190 -0700 |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
+++ gsl-1.16/Makefile.am 2014-05-16 06:59:46.408524913 -0700 |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
@@ -2,7 +2,14 @@ |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
# AUTOMAKE_OPTIONS = readme-alpha |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
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 statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline doc |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
+SOLARIS_SUNPERF = @SOLARIS_SUNPERF@ |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
+if SOLARIS_SUNPERF |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
37 |
+ CBLAS_DIRS= |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
38 |
+else |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
39 |
+ CBLAS_DIRS=cblas |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
40 |
+endif |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
41 |
+ |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
+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 statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline doc |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
43 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
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 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 statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
45 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
46 |
@@ -35,10 +42,16 @@ |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
47 |
bin_PROGRAMS = gsl-randist gsl-histogram |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
48 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
49 |
gsl_randist_SOURCES = gsl-randist.c |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
50 |
-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
51 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
52 |
gsl_histogram_SOURCES = gsl-histogram.c |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
53 |
+ |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
54 |
+if SOLARIS_SUNPERF |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
55 |
+gsl_randist_LDADD = libgsl.la |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
56 |
+gsl_histogram_LDADD = libgsl.la |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
57 |
+else |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
58 |
+gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
59 |
gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
60 |
+endif |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
61 |
|
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
62 |
check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test |
240dc166feab
PSARC 2015/122 GSL - GNU Scientific Library
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
63 |
TESTS = test_gsl_histogram.sh pkgconfig.test |