diff options
author | jokey <jokey@32389bae-6d03-0410-99cf-db05cde120eb> | 2007-10-07 05:29:17 +0000 |
---|---|---|
committer | jokey <jokey@32389bae-6d03-0410-99cf-db05cde120eb> | 2007-10-07 05:29:17 +0000 |
commit | f0231c57a7d9d1746c0ded96d7d6d9927bc009a9 (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /sci-libs/gsl/files | |
parent | deleted ifc and icc, now in main tree (diff) | |
download | sci-f0231c57a7d9d1746c0ded96d7d6d9927bc009a9.tar.gz sci-f0231c57a7d9d1746c0ded96d7d6d9927bc009a9.tar.bz2 sci-f0231c57a7d9d1746c0ded96d7d6d9927bc009a9.zip |
move stuff to root
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@753 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-libs/gsl/files')
-rw-r--r-- | sci-libs/gsl/files/cblas.pc.in | 12 | ||||
-rw-r--r-- | sci-libs/gsl/files/digest-gsl-1.10 | 3 | ||||
-rw-r--r-- | sci-libs/gsl/files/eselect.cblas.gsl | 5 | ||||
-rw-r--r-- | sci-libs/gsl/files/gsl-cblas.patch | 90 |
4 files changed, 0 insertions, 110 deletions
diff --git a/sci-libs/gsl/files/cblas.pc.in b/sci-libs/gsl/files/cblas.pc.in deleted file mode 100644 index a2580f85e..000000000 --- a/sci-libs/gsl/files/cblas.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/@LIBDIR@ -includedir=${prefix}/include - -Name: cblas -Description: GSL C Implementation of the Basic Linear Algebra Subprograms -Version: @PV@ -URL: http://www.gnu.org/software/gsl -Libs: -L${libdir} -lcblas -Libs.private: -lm -Cflags: -I${includedir} diff --git a/sci-libs/gsl/files/digest-gsl-1.10 b/sci-libs/gsl/files/digest-gsl-1.10 deleted file mode 100644 index f17e89c7b..000000000 --- a/sci-libs/gsl/files/digest-gsl-1.10 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d67be4f2e5560d6cf907e18a428becdc gsl-1.10.tar.gz 2842422 -RMD160 0b6ac2b1aec6a93521941620a824ae78f79adebb gsl-1.10.tar.gz 2842422 -SHA256 ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0 gsl-1.10.tar.gz 2842422 diff --git a/sci-libs/gsl/files/eselect.cblas.gsl b/sci-libs/gsl/files/eselect.cblas.gsl deleted file mode 100644 index af6fee51f..000000000 --- a/sci-libs/gsl/files/eselect.cblas.gsl +++ /dev/null @@ -1,5 +0,0 @@ -libgslcblas.so /usr/@LIBDIR@/libcblas.so -libgslcblas.so.0 /usr/@LIBDIR@/libcblas.so.0 -libgslcblas.a /usr/@LIBDIR@/libcblas.a -../blas/gsl/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc -gsl/gsl_cblas.h /usr/include/cblas.h diff --git a/sci-libs/gsl/files/gsl-cblas.patch b/sci-libs/gsl/files/gsl-cblas.patch deleted file mode 100644 index 3861786a1..000000000 --- a/sci-libs/gsl/files/gsl-cblas.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- configure.ac.orig 2007-09-19 13:25:25.644286706 +0100 -+++ configure.ac 2007-09-19 15:58:30.963832549 +0100 -@@ -130,6 +130,14 @@ - AC_CHECK_LIB(m, cos) - fi - -+dnl Use alternate cblas if specified by user -+CBLAS_LIBS="-lgslcblas" -+AC_ARG_WITH(cblas, -+ [AC_HELP_STRING([--with-cblas=<lib>], [use external CBLAS library <lib>])], -+ [CBLAS_LIBS="$withval"]) -+AM_CONDITIONAL(LINK_WITH_CBLAS_EXTERNAL, [ test ! "x$CBLAS_LIBS" = x"-lgslcblas" ]) -+AC_SUBST(CBLAS_LIBS) -+ - dnl Remember to put a definition in acconfig.h for each of these - AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1 - #include <fenv.h>]) ---- Makefile.am.orig 2007-09-19 13:25:11.299469242 +0100 -+++ Makefile.am 2007-09-19 15:53:28.594601509 +0100 -@@ -15,28 +15,29 @@ - - EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS SUPPORT gsl.spec.in gsl.m4 test_gsl_histogram.sh - --lib_LTLIBRARIES = libgsl.la --libgsl_la_SOURCES = version.c --libgsl_la_LIBADD = $(SUBLIBS) --libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) --noinst_HEADERS = templates_on.h templates_off.h -+lib_LTLIBRARIES = libgsl.la - --MINGW32_HOST = @MINGW32_HOST@ --if MINGW32_HOST --libgsl_la_LIBADD += cblas/libgslcblas.la --libgsl_la_LDFLAGS += -no-undefined -+if LINK_WITH_CBLAS_EXTERNAL -+gsl_cblas = $(CBLAS_LIBS) -+else -+gsl_cblas = cblas/libgslcblas.la - endif - -+libgsl_la_SOURCES = version.c -+libgsl_la_LDFLAGS = -no-undefined -version-info $(GSL_LT_VERSION) -+libgsl_la_LIBADD = $(SUBLIBS) $(gsl_cblas) -+noinst_HEADERS = templates_on.h templates_off.h -+ - m4datadir = $(datadir)/aclocal - m4data_DATA = gsl.m4 - - bin_PROGRAMS = gsl-randist gsl-histogram - - gsl_randist_SOURCES = gsl-randist.c --gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_randist_LDADD = libgsl.la $(gsl_cblas) - - gsl_histogram_SOURCES = gsl-histogram.c --gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la -+gsl_histogram_LDADD = libgsl.la $(gsl_cblas) - - check_SCRIPTS = test_gsl_histogram.sh - TESTS = test_gsl_histogram.sh ---- gsl-config.in.orig 2007-09-19 13:25:39.373069065 +0100 -+++ gsl-config.in 2007-09-19 13:01:31.410346928 +0100 -@@ -19,8 +19,7 @@ - --version output version information - - An external CBLAS library can be specified using the GSL_CBLAS_LIB --environment variable. The GSL CBLAS library is used by default. -- -+environment variable. By default, it will use the one compiled with gsl: @CBLAS_LIBS@. - EOF - - exit $1 -@@ -62,7 +61,7 @@ - ;; - - --libs) -- : ${GSL_CBLAS_LIB=-lgslcblas} -+ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} - echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm - ;; - ---- gsl.pc.in.orig 2007-09-19 13:25:49.477644892 +0100 -+++ gsl.pc.in 2007-09-19 13:01:56.355768487 +0100 -@@ -6,5 +6,5 @@ - Name: GSL - Description: GNU Scientific Library - Version: @VERSION@ --Libs: @GSL_LIBS@ -lgslcblas @LIBS@ -+Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@ - Cflags: @GSL_CFLAGS@ |