diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2010-04-09 01:31:06 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-04-09 01:31:06 +0000 |
commit | 45b74588da882f6495abe6bdd0ee073cb90bc49d (patch) | |
tree | e3f0a355ea4d6be7e5ae90f503e9872a1bb5196b /sci-libs/gsl | |
parent | Automated update of use.local.desc (diff) | |
download | historical-45b74588da882f6495abe6bdd0ee073cb90bc49d.tar.gz historical-45b74588da882f6495abe6bdd0ee073cb90bc49d.tar.bz2 historical-45b74588da882f6495abe6bdd0ee073cb90bc49d.zip |
Version bump
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/gsl')
-rw-r--r-- | sci-libs/gsl/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/gsl/Manifest | 11 | ||||
-rw-r--r-- | sci-libs/gsl/files/gsl-1.14-cblas.patch | 285 | ||||
-rw-r--r-- | sci-libs/gsl/gsl-1.14.ebuild | 87 |
4 files changed, 386 insertions, 5 deletions
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog index 845c129f2f13..0cdebdee3f18 100644 --- a/sci-libs/gsl/ChangeLog +++ b/sci-libs/gsl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/gsl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.66 2010/03/07 19:26:09 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.67 2010/04/09 01:31:06 bicatali Exp $ + +*gsl-1.14 (09 Apr 2010) + + 09 Apr 2010; SĂ©bastien Fabbro <bicatali@gentoo.org> +gsl-1.14.ebuild, + +files/gsl-1.14-cblas.patch: + Version bump *gsl-1.13-r2 (07 Mar 2010) diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index 4678f468cdef..0725b9e2170a 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -6,21 +6,24 @@ AUX eselect.cblas.gsl 216 RMD160 b2c3d435952eb73fcd02406fbd087176407c1f76 SHA1 8 AUX gsl-1.12-cblas.patch 16856 RMD160 4753e1cbefb13c5bce0d4ac67e282257269a566b SHA1 f5c3a654ef3b1ceb679610b277c0e68327a63b1a SHA256 05cf7ae01be3e7adc8e4c968caaf625e798de04f96e7f756cefba155f1cbaae6 AUX gsl-1.13-cblas-vars.patch 403 RMD160 f2633cc65627656287909ec37e568e1cd96be138 SHA1 82715bea7524bda9c1bb49e1b9700163795d8b80 SHA256 207b8fe48affca2564fcfffb9a01cca257f6bd1516355fd20cd3389fbb0ced40 AUX gsl-1.13-cblas.patch 15524 RMD160 294638c284b5b06f12405dd834b329a0755b1edd SHA1 fa0b377a7e40a9ba660909ab369fc3a744b9ae1a SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890 +AUX gsl-1.14-cblas.patch 17218 RMD160 0e168003aa059083463f1f60a8767c920c328bef SHA1 730bedfe54c179984b43a8cee02ce3a6d3ee26b9 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7388f80f719a47d8d64699d AUX gsl-1.6-deps.diff 418 RMD160 1c6aef845c115fce98c38857948b38a1b5e425b1 SHA1 b03629fad9b09c918ccea6bc328c9b8eb256d351 SHA256 0ca9e6e5431d608c282ce890971b23c2fdba5701f0cac0d70938f14df46e701f DIST gsl-1.12.tar.gz 2924732 RMD160 07c9d6a1e1fc1efb43dcc883fd15a2ca5d312da0 SHA1 3b5cba13f4b90e1473f693a5dc7efdcaae55fc46 SHA256 22019188d24c769acafc250ddc247105eb9cab099529b627078cbd8012c7b7b9 DIST gsl-1.13.tar.gz 3014270 RMD160 f71507181ace425df0977a13946f12cae4b65783 SHA1 02db78b9583bc7b2a577da6f45f5dd9f23ef737e SHA256 094648a6e40854cbe006357213fb16fe3e55d048a4a4df675df36a540f8ba2c7 +DIST gsl-1.14.tar.gz 3128269 RMD160 c89a30a0b38a0c83d73ded19180d52acd56e6a52 SHA1 e1a600e4fe359692e6f0e28b7e12a96681efbe52 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb DIST gsl-1.9.tar.gz 2574939 RMD160 faca66d02876135c31c2f3585baa1931488e1593 SHA1 7541504ed9864b1a278f9392830ecac9e0146258 SHA256 fcd1c6784997c2312d922d107fcb30462f5be4335ebdfa8e1e0e07568c962250 EBUILD gsl-1.12.ebuild 2460 RMD160 d9de6caa9b4aceb3c7696c9160352c364d2008b1 SHA1 e16a3cd809fbd06a6849576c6d1e26ca5e043f58 SHA256 7dbbb3962dec568868e28f1aa6a3f61688be8f40708bec912f3194c5f090e9ac EBUILD gsl-1.13-r1.ebuild 2437 RMD160 53d9b23b585400a1c2fdb987dcdb8b35d99151d6 SHA1 c9a29febb7404cbc6becd31a5d7e9fd90c714526 SHA256 bfc82d11cde3c5d2a0bcff4afb1a1454d7b87287abbbf46ae9e7c8d166ceeaf6 EBUILD gsl-1.13-r2.ebuild 2840 RMD160 8226d0b1d2b3f36d7a812a9970746bcc84481859 SHA1 44ffe6996747ab91353736258138857c15598737 SHA256 574c3173cb901eb390f1a46cc6f301bb522523a78e0c71870a49ee64c5a12640 EBUILD gsl-1.13.ebuild 2401 RMD160 e45235c161cc2c48c65c127fa7a68d4c0eaf02ad SHA1 132259d50fcd81dc5a1a102da4f80b786197ca19 SHA256 c063639b5f67d82543b3ca0ceb334e4fa27f4e15d7fe715c39a320856007de12 +EBUILD gsl-1.14.ebuild 2797 RMD160 d2e537223556bb01ec05fce741bcafb2f605d86f SHA1 9b39bbaf94cdd98f2d469f6c7022e20281809c30 SHA256 fb3a65df2a66217210d985aa2b5579c16a8de8c635f95e2fe68891edfc24ba5d EBUILD gsl-1.9-r1.ebuild 2158 RMD160 c8aad89ccf83c72d1d7e649b836ead81c8e88c94 SHA1 73df32e6af7d7d8f144d352918c9b5c47ff10746 SHA256 cf2ae1ff43e463f2fb58cb29cc1815a72650cb66106499ca9f2b6cc64adb9fab -MISC ChangeLog 10371 RMD160 2bf42c57817f1946c7d8d95f3957d644c9879621 SHA1 dbdfe700bf0b181dbc972bf10c99ef59c7064197 SHA256 01bbbf8c61e3edac38d0624c037f00a271bad14aabe94c6e99755d89ed128772 +MISC ChangeLog 10520 RMD160 743dbe04207a13f6b56c73495235dec865c9fcd6 SHA1 ffd785c8f0e29951bf91db45b327f76bb9d5c6e9 SHA256 13bf8f4b16e3158daf86d6f61825c57ab2544680814df89484432780e6c238ec MISC metadata.xml 971 RMD160 a22e325865e4cd1f8a2fb06bbbec4ec87592c816 SHA1 c5bd3fc110d891fd22783bd92d259357672cb89b SHA256 50d67407a84b02c8826cf03a3256b38b588e45b31abffef6d7130883bc5a549b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuT/dYACgkQgAnW8HDreRYhZACfQNr3laOzUyrZLdl7h2UR4BFr -m6QAoNNBJBYNwrDTKQWGiNzIlnyUUT7B -=TQPu +iEYEARECAAYFAku+jmAACgkQ1ycZbhPLE2CFHACfUrf+8mq1Lqtu+M5529A7MT8p +oQAAnj5D8CYfizopfzAuca3IypO0h2L5 +=ZRxv -----END PGP SIGNATURE----- diff --git a/sci-libs/gsl/files/gsl-1.14-cblas.patch b/sci-libs/gsl/files/gsl-1.14-cblas.patch new file mode 100644 index 000000000000..b8d9fb7c8706 --- /dev/null +++ b/sci-libs/gsl/files/gsl-1.14-cblas.patch @@ -0,0 +1,285 @@ +diff -Nur gsl-1.14.orig/acx_cblas.m4 gsl-1.14/acx_cblas.m4 +--- gsl-1.14.orig/acx_cblas.m4 1970-01-01 01:00:00.000000000 +0100 ++++ gsl-1.14/acx_cblas.m4 2010-04-09 02:19:59.000000000 +0100 +@@ -0,0 +1,60 @@ ++AC_DEFUN([ACX_CBLAS],[ ++ use_cblas=no ++ use_cblas_libs="-lcblas -lblas" ++ use_cblas_cflags="" ++ ++ AC_ARG_WITH(cblas, ++ [AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])]) ++ ++ case $with_cblas in ++ yes) use_cblas=yes ;; ++ no | "" ) use_cblas=no ;; ++ -* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;; ++ *) use_cblas_libs="-l$with_cblas" ;; ++ esac ++ ++ AC_ARG_WITH(cblas-libs, ++ [AS_HELP_STRING([--with-cblas-libs=<libs>], ++ [external cblas libraries to link with (default is "$use_cblas_libs")])], ++ [use_cblas_libs=$withval], []) ++ ++ AC_ARG_WITH(cblas-cflags, ++ [AS_HELP_STRING([--with-cblas-cflags=<flags>], ++ [extra cflags to compile with external cblas ("-I<dir>")])], ++ [use_cblas_cflags=$withval], []) ++ ++ if test x$use_cblas != xno; then ++ if test "x$CBLAS_LIBS" = x; then ++ CBLAS_LIBS="$use_cblas_libs" ++ fi ++ if test "x$CBLAS_FLAGS" = x; then ++ CBLAS_CFLAGS="$use_cblas_cflags" ++ fi ++ ++ CFLAGS_sav="$CFLAGS" ++ CFLAGS="$CFLAGS $CBLAS_CFLAGS" ++ AC_CHECK_HEADER(cblas.h, , ++ [AC_MSG_ERROR([ ++ *** Header file cblas.h not found. ++ *** If you installed cblas header in a non standard place, ++ *** specify its install prefix using the following option ++ *** --with-cblas-cflags="-I<include_dir>"]) ++ ]) ++ CFLAGS="$CFLAGS_sav" ++ ++ LIBS_sav="$LIBS" ++ LIBS="$LIBS $CBLAS_LIBS -lm" ++ AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS]) ++ AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes], ++ [AC_MSG_ERROR([ ++ *** Linking with cblas with $LIBS failed. ++ *** If you installed cblas library in a non standard place, ++ *** specify its install prefix using the following option ++ *** --with-cblas-libs="-L<lib_dir> -l<lib>"]) ++ ]) ++ AC_MSG_RESULT($use_cblas) ++ LIBS="$LIBS_sav" ++ AC_SUBST(CBLAS_CFLAGS) ++ AC_SUBST(CBLAS_LIBS) ++ fi ++]) +diff -Nur gsl-1.14.orig/bspline/Makefile.am gsl-1.14/bspline/Makefile.am +--- gsl-1.14.orig/bspline/Makefile.am 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/bspline/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -12,6 +12,6 @@ + + TESTS = $(check_PROGRAMS) + +-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 ../statistics/libgslstatistics.la ++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 ../statistics/libgslstatistics.la + + test_SOURCES = test.c +diff -Nur gsl-1.14.orig/configure.ac gsl-1.14/configure.ac +--- gsl-1.14.orig/configure.ac 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/configure.ac 2010-04-09 02:19:59.000000000 +0100 +@@ -185,6 +185,16 @@ + AC_CHECK_LIB(m, cos) + fi + ++sinclude(acx_cblas.m4) ++ACX_CBLAS ++if test "x$CBLAS_LIBS" != "x"; then ++ CBLAS_LINK_LIBS="$CBLAS_LIBS" ++else ++ CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la" ++ CBLAS_LIBS="-lgslcblas" ++fi ++AC_SUBST(CBLAS_LINK_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>]) +diff -Nur gsl-1.14.orig/eigen/Makefile.am gsl-1.14/eigen/Makefile.am +--- gsl-1.14.orig/eigen/Makefile.am 2010-04-09 02:04:46.000000000 +0100 ++++ gsl-1.14/eigen/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -11,7 +11,7 @@ + + TESTS = $(check_PROGRAMS) + +-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 ++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 + + test_SOURCES = test.c + +diff -Nur gsl-1.14.orig/gsl-config.in gsl-1.14/gsl-config.in +--- gsl-1.14.orig/gsl-config.in 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/gsl-config.in 2010-04-09 02:19:59.000000000 +0100 +@@ -58,11 +58,11 @@ + ;; + + --cflags) +- echo @GSL_CFLAGS@ ++ echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ + ;; + + --libs) +- : ${GSL_CBLAS_LIB=-lgslcblas} ++ : ${GSL_CBLAS_LIB=@CBLAS_LIBS@} + echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm + ;; + +diff -Nur gsl-1.14.orig/gsl.pc.in gsl-1.14/gsl.pc.in +--- gsl-1.14.orig/gsl.pc.in 2010-04-09 02:04:46.000000000 +0100 ++++ gsl-1.14/gsl.pc.in 2010-04-09 02:19:59.000000000 +0100 +@@ -6,5 +6,5 @@ + Name: GSL + Description: GNU Scientific Library + Version: @VERSION@ +-Libs: @GSL_LIBS@ -lgslcblas @LIBS@ +-Cflags: @GSL_CFLAGS@ ++Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@ ++Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@ +diff -Nur gsl-1.14.orig/interpolation/Makefile.am gsl-1.14/interpolation/Makefile.am +--- gsl-1.14.orig/interpolation/Makefile.am 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/interpolation/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -10,7 +10,7 @@ + + TESTS = $(check_PROGRAMS) + +-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 ++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 + + test_SOURCES = test.c + +diff -Nur gsl-1.14.orig/linalg/Makefile.am gsl-1.14/linalg/Makefile.am +--- gsl-1.14.orig/linalg/Makefile.am 2010-04-09 02:04:46.000000000 +0100 ++++ gsl-1.14/linalg/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -12,7 +12,7 @@ + + check_PROGRAMS = test + +-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 ++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 + + test_SOURCES = test.c + +diff -Nur gsl-1.14.orig/Makefile.am gsl-1.14/Makefile.am +--- gsl-1.14.orig/Makefile.am 2010-04-09 02:04:46.000000000 +0100 ++++ gsl-1.14/Makefile.am 2010-04-09 02:20:13.000000000 +0100 +@@ -19,13 +19,12 @@ + + lib_LTLIBRARIES = libgsl.la + libgsl_la_SOURCES = version.c +-libgsl_la_LIBADD = $(SUBLIBS) ++libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@ + libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION) + noinst_HEADERS = templates_on.h templates_off.h build.h + + MINGW32_HOST = @MINGW32_HOST@ + if MINGW32_HOST +-libgsl_la_LIBADD += cblas/libgslcblas.la + libgsl_la_LDFLAGS += -no-undefined + endif + +@@ -35,10 +34,10 @@ + 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_histogram_SOURCES = gsl-histogram.c +-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la ++gsl_histogram_LDADD = libgsl.la + + check_SCRIPTS = test_gsl_histogram.sh + TESTS = test_gsl_histogram.sh +@@ -56,6 +55,8 @@ + -e 's|@includedir[@]|$(includedir)|g' \ + -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \ + -e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \ ++ -e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \ ++ -e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \ + -e 's|@LIBS[@]|$(LIBS)|g' \ + -e 's|@VERSION[@]|$(VERSION)|g' + +diff -Nur gsl-1.14.orig/multifit/Makefile.am gsl-1.14/multifit/Makefile.am +--- gsl-1.14.orig/multifit/Makefile.am 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/multifit/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -13,8 +13,8 @@ + TESTS = $(check_PROGRAMS) + + test_SOURCES = test.c +-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 ++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 + + #demo_SOURCES = demo.c +-#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 ++#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 + +diff -Nur gsl-1.14.orig/multimin/Makefile.am gsl-1.14/multimin/Makefile.am +--- gsl-1.14.orig/multimin/Makefile.am 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/multimin/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -13,8 +13,8 @@ + TESTS = $(check_PROGRAMS) + + test_SOURCES = test.c test_funcs.c test_funcs.h +-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 ++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 + + #demo_SOURCES = demo.c +-#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 ++#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 + +diff -Nur gsl-1.14.orig/multiroots/Makefile.am gsl-1.14/multiroots/Makefile.am +--- gsl-1.14.orig/multiroots/Makefile.am 2010-04-09 02:04:46.000000000 +0100 ++++ gsl-1.14/multiroots/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -15,5 +15,5 @@ + TESTS = $(check_PROGRAMS) + + test_SOURCES = test.c test_funcs.c test_funcs.h +-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 ++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 + +diff -Nur gsl-1.14.orig/ode-initval/Makefile.am gsl-1.14/ode-initval/Makefile.am +--- gsl-1.14.orig/ode-initval/Makefile.am 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/ode-initval/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -12,7 +12,7 @@ + + TESTS = $(check_PROGRAMS) + +-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 ++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 + + test_SOURCES = test.c + +diff -Nur gsl-1.14.orig/poly/Makefile.am gsl-1.14/poly/Makefile.am +--- gsl-1.14.orig/poly/Makefile.am 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/poly/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -10,7 +10,7 @@ + + TESTS = $(check_PROGRAMS) + +-check_PROGRAMS = test ++#check_PROGRAMS = test + + test_SOURCES = test.c + test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la +diff -Nur gsl-1.14.orig/specfunc/Makefile.am gsl-1.14/specfunc/Makefile.am +--- gsl-1.14.orig/specfunc/Makefile.am 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/specfunc/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -12,7 +12,7 @@ + + check_PROGRAMS = test + +-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 ++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 + + 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 + +diff -Nur gsl-1.14.orig/wavelet/Makefile.am gsl-1.14/wavelet/Makefile.am +--- gsl-1.14.orig/wavelet/Makefile.am 2010-04-09 02:04:47.000000000 +0100 ++++ gsl-1.14/wavelet/Makefile.am 2010-04-09 02:19:59.000000000 +0100 +@@ -10,7 +10,7 @@ + + TESTS = $(check_PROGRAMS) + +-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 ++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 + + test_SOURCES = test.c + diff --git a/sci-libs/gsl/gsl-1.14.ebuild b/sci-libs/gsl/gsl-1.14.ebuild new file mode 100644 index 000000000000..22e326e52368 --- /dev/null +++ b/sci-libs/gsl/gsl-1.14.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14.ebuild,v 1.1 2010/04/09 01:31:06 bicatali Exp $ + +EAPI="3" + +inherit eutils flag-o-matic autotools + +DESCRIPTION="The GNU Scientific Library" +HOMEPAGE="http://www.gnu.org/software/gsl/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="cblas" + +RDEPEND="cblas? ( virtual/cblas )" +DEPEND="${RDEPEND} + app-admin/eselect-cblas + dev-util/pkgconfig" + +pkg_setup() { + ESELECT_PROF="gsl" + # prevent to use external cblas from a previously installed gsl + local current_lib=$(eselect cblas show | cut -d' ' -f2) + if use cblas && [[ ${current_lib} == gsl ]]; then + ewarn "USE flag cblas is set: linking gsl with an external cblas." + ewarn "However the current selected external cblas is gsl." + ewarn "Please install and/or eselect another cblas" + die "Circular gsl dependency" + fi +} + +src_prepare() { + filter-flags -ffast-math + epatch "${FILESDIR}"/${P}-cblas.patch + eautoreconf + + cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ + sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \ + "${T}"/eselect.cblas.gsl || die + fi +} + +src_configure() { + if use cblas; then + export CBLAS_LIBS="$(pkg-config --libs cblas)" + export CBLAS_CFLAGS="$(pkg-config --cflags cblas)" + fi + econf $(use_with cblas) +} + +src_install() { + emake install DESTDIR="${D}" || die "emake install failed." + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO + + # take care of pkgconfig file for cblas implementation. + sed -e "s/@LIBDIR@/$(get_libdir)/" \ + -e "s/@PV@/${PV}/" \ + -e "/^prefix=/s:=:=${EPREFIX}:" \ + -e "/^libdir=/s:=:=${EPREFIX}:" \ + "${FILESDIR}"/cblas.pc.in > cblas.pc \ + || die "sed cblas.pc failed" + insinto /usr/$(get_libdir)/blas/gsl + doins cblas.pc || die "installing cblas.pc failed" + eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \ + ${ESELECT_PROF} +} + +pkg_postinst() { + local p=cblas + local current_lib=$(eselect ${p} show | cut -d' ' -f2) + if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then + # work around eselect bug #189942 + local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config + [[ -e ${configfile} ]] && rm -f ${configfile} + eselect ${p} set ${ESELECT_PROF} + elog "${p} has been eselected to ${ESELECT_PROF}" + else + elog "Current eselected ${p} is ${current_lib}" + elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):" + elog "\t eselect ${p} set ${ESELECT_PROF}" + fi +} |