22690727 Backport 22665511 to 11.3-SRU - libgsl is missing some files s11u3-sru
authorRich Burridge <rich.burridge@oracle.com>
Tue, 23 Feb 2016 09:35:42 -0800
branchs11u3-sru
changeset 5483 c705419970e3
parent 5467 aced53706c85
child 5484 1310f15efa0d
22690727 Backport 22665511 to 11.3-SRU - libgsl is missing some files
components/libgsl/Makefile
components/libgsl/libgsl.p5m
--- a/components/libgsl/Makefile	Wed Feb 17 12:42:41 2016 -0800
+++ b/components/libgsl/Makefile	Tue Feb 23 09:35:42 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -47,6 +47,19 @@
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+# NOTE:
+# The libgsl package on Solaris is getting GSL CBLAS routines from
+# libsunperf.so. Programs wishing to use this functionality should use the
+# /usr/include/sunperf.h header file for the associated definitions and
+# function prototypes and link against -lsunperf.
+#
+# To retain compatibility with libgsl on other platforms, and to require
+# no changes to FOSS software being ported to Solaris, the libgsl package
+# manifest will also include the /usr/include/gsl/gsl_cblas.h header file
+# and provide links from /usr/lib/libgslcblas.so and
+# /usr/lib/$(MACH64)/libgslcblas.so to their equivalent libsunperf.so
+# library files.
+
 # By default, tests in each GSL sub-directory are linked statically against
 # a set of .la files. We don't deliver those in the GSL package, so we
 # adjust all the tests to link against the dynamic GSL library instead.
--- a/components/libgsl/libgsl.p5m	Wed Feb 17 12:42:41 2016 -0800
+++ b/components/libgsl/libgsl.p5m	Tue Feb 23 09:35:42 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -57,6 +57,7 @@
 file path=usr/include/gsl/gsl_block_ulong.h
 file path=usr/include/gsl/gsl_block_ushort.h
 file path=usr/include/gsl/gsl_bspline.h
+file cblas/gsl_cblas.h path=usr/include/gsl/gsl_cblas.h
 file path=usr/include/gsl/gsl_cdf.h
 file path=usr/include/gsl/gsl_chebyshev.h
 file path=usr/include/gsl/gsl_check_range.h
@@ -260,10 +261,13 @@
 link path=usr/lib/$(MACH64)/libgsl.so target=libgsl.so.0.17.0
 link path=usr/lib/$(MACH64)/libgsl.so.0 target=libgsl.so.0.17.0
 file path=usr/lib/$(MACH64)/libgsl.so.0.17.0
+link path=usr/lib/$(MACH64)/libgslcblas.so \
+    target=../studio/$(MACH64)/libsunperf.so
 file path=usr/lib/$(MACH64)/pkgconfig/gsl.pc
 link path=usr/lib/libgsl.so target=libgsl.so.0.17.0
 link path=usr/lib/libgsl.so.0 target=libgsl.so.0.17.0
 file path=usr/lib/libgsl.so.0.17.0
+link path=usr/lib/libgslcblas.so target=studio/libsunperf.so
 file path=usr/lib/pkgconfig/gsl.pc
 file path=usr/share/aclocal/gsl.m4
 file path=usr/share/info/gsl-ref.info