diff options
| -rw-r--r-- | sci-libs/gsl/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-libs/gsl/Manifest | 27 | ||||
| -rw-r--r-- | sci-libs/gsl/files/gsl-1.16-cblas.patch | 294 | ||||
| -rw-r--r-- | sci-libs/gsl/gsl-1.16.ebuild | 103 |
4 files changed, 426 insertions, 8 deletions
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog index ec1cec542e00..d4e6ae09e6e2 100644 --- a/sci-libs/gsl/ChangeLog +++ b/sci-libs/gsl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/gsl -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.85 2013/03/29 12:17:43 jlec Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.86 2014/04/16 13:34:45 hasufell Exp $ + +*gsl-1.16 (16 Apr 2014) + + 16 Apr 2014; Julian Ospald <hasufell@gentoo.org> +files/gsl-1.16-cblas.patch, + +gsl-1.16.ebuild: + version bump wrt #507158 29 Mar 2013; Justin Lecher <jlec@gentoo.org> gsl-1.14-r1.ebuild, gsl-1.15.ebuild: diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index 2fe097b7bb51..91a017a3bf33 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX cblas.pc.in 290 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1 SHA512 2a1dc22097e2a50fd4a797c446b32202b74e9d754c8b61c51a3789c3eb42372adcc7fb25901c468d604cc4e7961d7f11e0e5883179894047948e46879fc04719 WHIRLPOOL f8e93aa2c61d3ac08664c3162f0e754c1d6cefca0a4d4ab8ee8f763e6ec46049ff5537c7f9266200856b58ffab88fb9af115eb4be32deb99ed6d2005abcb13ec AUX eselect.cblas.gsl 216 SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7 SHA512 e5cd92f4e9829538642a0fed54fdf75bc579c8c20769997ec5a3ce0287993476e68fbeefec8e46162d05ea908d2e79187c15ebdd00f6558ecbd25de21ece64dc WHIRLPOOL 1a0591e670a1ca51fa6cc4b2883931a49f3da59c2c673d786f6acdb72b50b7fee22ee30f2d3c6ac864c149381c23ca5c41ba586f159830cdeff97b86cf6a03f3 @@ -7,17 +7,32 @@ AUX gsl-1.13-cblas-vars.patch 403 SHA256 207b8fe48affca2564fcfffb9a01cca257f6bd1 AUX gsl-1.13-cblas.patch 15524 SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890 SHA512 ed96a576a4c218d002e091088f04e2654c651d0050e8487ef69686fd7715bf59cd56c40751bcf558314dff59ece8acb47bfa28d3a405b2ecf3fc56e30d46bdaa WHIRLPOOL c9e7146512e16a65f35687a7f832c9e0e958c6b7d7471a61527eeac3fcb616c5a16cc26ab483b8cefa194cb232a662439a06625da38cb8b86bdf0f5444ad25d5 AUX gsl-1.14-cblas.patch 17218 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7388f80f719a47d8d64699d SHA512 8d009f7b7e4c6cb90864b90cc86a8c5b6b3d80d899225758683639d0e1a114355bd4f8adfb41bc9ead57990a3274cff65743c59b86fc1bc699c46a61fb31fd42 WHIRLPOOL f3b52170a5818a5d8d2812272fbbdd688626cbeb8679fb0eb16fb34a7e85a88da3302b3a4f79264e9ae39c79143f3bf5db90d678c04a2d34bcf186962e990b70 AUX gsl-1.15-cblas.patch 17217 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491 SHA512 fd099610b612b44a8b8ab8efd6350894fe7df46c94cf20e9d4377360c4cc31b11a8d9e18f6db6db9d8f4b7098b1d1569167ddb29e30396c656e381d25c1ec852 WHIRLPOOL 4794cfb018f50e59e11eb60bf11d348a7131360d757868aa9f08e75f432ee786d82143cdb3743ce3a526649cc2877b45dbe14eb49464cea9f23add0db87638b5 +AUX gsl-1.16-cblas.patch 17458 SHA256 568f6bf06b9441f741c028eaf7b12edb0e96093a16ea7a2d975e0cbde261c083 SHA512 70cae5682bfc7788e6f67ec355b52e291f32c2500b9baf9dd336d7cbb42b5eac4d89ecafeb23c4b478836d3c137d40d47dd17d375708df3c2dd41781a78f56bf WHIRLPOOL a7a5e6b52dc0466ad180853f5824d071d715743ef850ec808c7615fcc3b4f98d940c6f896faf44647c8e0915a6e5b6b7575ff9b66a59e337e04cd18d94cc7807 DIST gsl-1.14.tar.gz 3128269 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb DIST gsl-1.15.tar.gz 3281134 SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3 SHA512 dcea557bcd34d4ee6d2c52741c2f95702e5e6110a99f033b412489b1930d21a40ead29392f754656375801d706df01199878263e856ca3081f9a514dc3299185 WHIRLPOOL 06ffffb83ea56cf6306878063770a117e096352dda3c3dd4a7526153bc770969f61e38fa08c02ec01335bd812581db15e4e5164a7da2363741179268cb393478 +DIST gsl-1.16.tar.gz 3534080 SHA256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb WHIRLPOOL 46bf814c882ca36600d258097642a734b6a6483302cc64c14cab55c0c056ae6116c204495b3b81c57fec1871e145fbc5aa3900006e52e494e9e2fcd34ec06301 EBUILD gsl-1.14-r1.ebuild 3119 SHA256 13e5512a1cd3f235efe9cd092b087fe4714a19e27f606d59c8bc737e0fd20d2a SHA512 c4ed226aa8907a750cdf3384a124db67db084fcc5025cd0cf20fe5a5d2e338ce5f6c75d7aea3e3baa7fb205692d78faa3e8045683bafe2f30bd2c8cb12107da7 WHIRLPOOL c54d9ff3c959f119d23a20e477bcc2c973302ca2977286c1d693ebb6087614a8fde5105f369ab69f4f29e3729e7eda6072a57d546c1e12efe58341f6cacf62de EBUILD gsl-1.14.ebuild 2865 SHA256 3b25d58fd023dc99a790e243e648c4e9cfac466d86429fd400c9e139a3fcd3f6 SHA512 6de22c0b20b987de529aaaaedde6bcb40742fd7e3f31122a92614d2674f91ee994af061d9240bef4ffce386b04dc555f1c125a56f6876a987c9aaafa89769aa4 WHIRLPOOL c4e8be5f0b6d191f121ee87a8dcdf5123056cb8e7c79ea1db67d5b6606f7b967f0aad499f17260447af8808a60271213604350cc8954c463aa74dc2f73d94ccd EBUILD gsl-1.15.ebuild 3144 SHA256 5a55cee973ed787a05afeacbb180b662965db42441592c9d802db392069ee8e4 SHA512 9a8a3508133d8dbf3c9daba064d2fd7b2de6c64901b439347bed4f4ef4a6b9ea8dd4cb1fa19f27fa34bcb9255b85df3ea1e7321186c11c035344fb75d4053b15 WHIRLPOOL fc7859ca3f21b856fb914687e23886c7654406125d66877f231c288a1a237262bafc3e6b0d92145e6d82f0a98df4cdd7e470b2bd5327a20d19326ecea0d7d95b -MISC ChangeLog 13140 SHA256 d4a44218259efb238a39d1f0d8309db4498627ed6b09d8407a71a1e2407f1fdf SHA512 8bcfada6497224eb6934b78e92b5b8dcf3056eac77b54a5970f33b4ebabc8f458189ae8742bfcd24f481491504e93c21b5a5ef0a774fed897e96b43247ae863f WHIRLPOOL cd27c756e32ed27c106d344eeb31fc8c93810c13b3e7ed858f9d91f9fda7167cc3b8f2bfee0ba8bf85ef37f97d6e4f4d984977ed49a0a413c549eaf57a62541a +EBUILD gsl-1.16.ebuild 3142 SHA256 a37c36577b7de04715fa0440a5c18e15165c7d69cb2080d5ecd0236a52dd562a SHA512 c955c57e3b5d5a04816c42ab4be56941292af4a8d20c22743aeaae521dbc07c6a484742c0740878f3163b976814dfe9814a13c55534e380355e3e4308a41b5dc WHIRLPOOL ba139d41f12dfc4377623218e6b8050e19d1400785915be863dac5d26b83c29497812a493bfa0aefe679110c730e582267ada3a1075d84dcced7362c5e016d15 +MISC ChangeLog 13297 SHA256 7eed96c7bfcb4d3074bb30d4c8607e0b211b313ce9724ba21698269051d487e9 SHA512 94ee107b1d211a165701b244bb9f0f4a84e35838b550527ddb88690fd9dcd7af88e16e6623b6f8e7b4cb1fe335790e67a7675a963eaf7c3c2692beb96aaa5b59 WHIRLPOOL e19ea1440565de8e4ac2ddcb3257fa534af46bb82212e737535bc8c907becd1e8ade7efdea6e9df40145b41957e7f23fc3f0f38e747a48a39db476463d327816 MISC metadata.xml 1026 SHA256 6df14f9543ae80840437ac04fca5f5b4ca052a722c5146b015eeb26b1c11f1f4 SHA512 02751504e7a1563ca2008426536d03c8d5f00272519f73dccbe4df8f93fa26132fa57eee085cee9e1ce68e396893ef602283d8cd6722ba2f27bb322b8c201951 WHIRLPOOL fcbfd38fc5d1bafc3d3e08d0031b401fd5d67f1dcc1318c9ef57fa443d8998c6f9975d4f9a2b08e1d10e5e0e557511508193fd9742dc6e415067ccd723f740d8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREKAAYFAlFVhmgACgkQgAnW8HDreRZBPACePenAFSWQUPKkOMgMOYT8eCxk -TSUAnAltXQQom6EL8u0R94pbr0alvxED -=q5fL +iQJ8BAEBCABmBQJTTob6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgLyAQAK2P4fFxqYobiywlgGLUiDk9 +ixlSrQPZQi2fMgbY1jMUEtWojaub8sSDdsneOJwR2rTyKGQowaEORJ2AFSEWIrB2 +wbAjsdtomjF74HTGg3lL8uxSDFlap4DE60r2x+gYzeMZPPHOQ5hGj+GpBXolcCuh +geeu52XBZS8mJxoTvhyR133N3K04ftXwLlIq+KjVFxBW9D81NfOa7o/mTd/35SC0 +yGHhwKzqPT9hVEmb0ay4clBX3wGWh9J9vYljn0XIKqOuyOY1Iy9gF8HA9dCvBZty +rydURQWPtnl21NtpHz32QtJIW3UMPseeXdNKJw/RzUuAMgy8f0sQFZqG7h8KvzlB +bwxc70cATZQxm/vFINTRnxOv55h0Wzd/Yq41rUVl6t8uFAwiT0BVdLc/yu/TSB9y +YusNZwDDtwWoVV2Ehr803wUG828cak7cOPYPFHUKHZmrD6b4ToW4Q67OD6S9l24U +CWoxc8Lj7LOTShDtWbc2F9Rk3gBgnaWT9mAuGrnHfLJqvs4MsbYRdcI0IkBvdbjy +eniZXdS7Xovee++jo9fs7sdGCjvVpmQs7KVQ2GL0em7dfV8BTVKxPlDsJ1iz/Uv7 +OVpnJQDSrRATcm6YZg+renN6daDSXcAOEPfdVatlBBQf+9gBGQ/z4/Z5aIb10DS9 +b5pE3cpT5W/C+kHgsrbH +=sAv2 -----END PGP SIGNATURE----- diff --git a/sci-libs/gsl/files/gsl-1.16-cblas.patch b/sci-libs/gsl/files/gsl-1.16-cblas.patch new file mode 100644 index 000000000000..c29ef5294717 --- /dev/null +++ b/sci-libs/gsl/files/gsl-1.16-cblas.patch @@ -0,0 +1,294 @@ +diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4 +--- gsl-1.16.orig/ax_cblas.m4 1969-12-31 16:00:00.000000000 -0800 ++++ gsl-1.16/ax_cblas.m4 2013-08-19 15:48:54.376300825 -0700 +@@ -0,0 +1,69 @@ ++AC_DEFUN([AX_CBLAS],[ ++ ++ ext_cblas=no ++ ext_cblas_libs="-lcblas" ++ ext_cblas_cflags="" ++ ++ AC_ARG_WITH(cblas-external, ++ [AS_HELP_STRING([--with-cblas-external], ++ [Use external CBLAS library (default is no)])], ++ [with_ext_cblas=$withval], ++ [with_ext_cblas=no]) ++ ++ case $with_ext_cblas in ++ no) ext_cblas=no ;; ++ yes) ext_cblas=yes ;; ++ -* | */* | *.a | *.so | *.so.* | *.o) ++ ext_cblas=yes ++ ext_cblas_libs="$with_cblas" ;; ++ *) ext_cblas=yes ++ ext_cblas_libs="-l$with_cblas" ;; ++ esac ++ ++ AC_ARG_WITH(cblas-external-libs, ++ [AS_HELP_STRING([--with-cblas-external-libs=<libs>], ++ [External cblas libraries to link with (default is "$ext_cblas_libs")])], ++ [ext_cblas_libs=$withval], ++ []) ++ ++ AC_ARG_WITH(cblas-external-cflags, ++ [AS_HELP_STRING([--with-cblas-external-cflags=<flags>], ++ [Pre-processing flags to compile with external cblas ("-I<dir>")])], ++ [ext_cblas_cflags=$withval], ++ []) ++ ++ if test x$ext_cblas != xno; then ++ if test "x$CBLAS_LIBS" = x; then ++ CBLAS_LIBS="$ext_cblas_libs" ++ fi ++ if test "x$CBLAS_CFLAGS" = x; then ++ CBLAS_CFLAGS="$ext_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-external-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, [ext_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-external-libs="-L<lib_dir> -l<lib>"]) ++ ]) ++ AC_MSG_RESULT($ext_cblas) ++ LIBS="$LIBS_sav" ++ AC_SUBST([CBLAS_CFLAGS]) ++ AC_SUBST([CBLAS_LIBS]) ++ fi ++]) +diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am +--- gsl-1.16.orig/bspline/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/bspline/Makefile.am 2013-08-19 15:25:27.728497742 -0700 +@@ -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.16.orig/configure.ac gsl-1.16/configure.ac +--- gsl-1.16.orig/configure.ac 2013-07-19 08:14:45.000000000 -0700 ++++ gsl-1.16/configure.ac 2013-08-19 15:28:24.172640793 -0700 +@@ -191,6 +191,16 @@ + AC_CHECK_LIB(m, cos) + fi + ++sinclude(ax_cblas.m4) ++AX_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.16.orig/eigen/Makefile.am gsl-1.16/eigen/Makefile.am +--- gsl-1.16.orig/eigen/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/eigen/Makefile.am 2013-08-19 15:25:27.728497742 -0700 +@@ -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.16.orig/gsl-config.in gsl-1.16/gsl-config.in +--- gsl-1.16.orig/gsl-config.in 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/gsl-config.in 2013-08-19 15:25:27.728497742 -0700 +@@ -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 @GSL_LIBM@ + ;; + +diff -Nur gsl-1.16.orig/gsl.pc.in gsl-1.16/gsl.pc.in +--- gsl-1.16.orig/gsl.pc.in 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/gsl.pc.in 2013-08-19 15:25:27.728497742 -0700 +@@ -2,7 +2,7 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-GSL_CBLAS_LIB=-lgslcblas ++GSL_CBLAS_LIB=@CBLAS_LIBS@ + + Name: GSL + Description: GNU Scientific Library +diff -Nur gsl-1.16.orig/interpolation/Makefile.am gsl-1.16/interpolation/Makefile.am +--- gsl-1.16.orig/interpolation/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/interpolation/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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.16.orig/linalg/Makefile.am gsl-1.16/linalg/Makefile.am +--- gsl-1.16.orig/linalg/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/linalg/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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.16.orig/Makefile.am gsl-1.16/Makefile.am +--- gsl-1.16.orig/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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 pkgconfig.test + TESTS = test_gsl_histogram.sh pkgconfig.test +@@ -57,6 +56,8 @@ + -e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \ + -e 's|@GSL_LIBM[@]|$(GSL_LIBM)|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' + +--- gsl-1.16.orig/multifit/Makefile.am 2013-07-18 06:04:26.000000000 +1000 ++++ gsl-1.16/multifit/Makefile.am 2013-11-22 16:57:26.170330257 +1100 +@@ -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 ../sort/libgslsort.la ../statistics/libgslstatistics.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 ../sort/libgslsort.la ../statistics/libgslstatistics.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.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am +--- gsl-1.16.orig/multimin/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/multimin/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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.16.orig/multiroots/Makefile.am gsl-1.16/multiroots/Makefile.am +--- gsl-1.16.orig/multiroots/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/multiroots/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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.16.orig/ode-initval/Makefile.am gsl-1.16/ode-initval/Makefile.am +--- gsl-1.16.orig/ode-initval/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/ode-initval/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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.16.orig/poly/Makefile.am gsl-1.16/poly/Makefile.am +--- gsl-1.16.orig/poly/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/poly/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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 ../sort/libgslsort.la +diff -Nur gsl-1.16.orig/specfunc/Makefile.am gsl-1.16/specfunc/Makefile.am +--- gsl-1.16.orig/specfunc/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/specfunc/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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.16.orig/wavelet/Makefile.am gsl-1.16/wavelet/Makefile.am +--- gsl-1.16.orig/wavelet/Makefile.am 2013-07-17 13:04:26.000000000 -0700 ++++ gsl-1.16/wavelet/Makefile.am 2013-08-19 15:25:27.729497736 -0700 +@@ -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.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild new file mode 100644 index 000000000000..8c2094c2dcdc --- /dev/null +++ b/sci-libs/gsl/gsl-1.16.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.16.ebuild,v 1.1 2014/04/16 13:34:45 hasufell Exp $ + +EAPI=5 + +inherit eutils flag-o-matic autotools toolchain-funcs + +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 ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="cblas-external static-libs" + +RDEPEND="cblas-external? ( virtual/cblas )" +DEPEND="${RDEPEND} + app-admin/eselect-cblas + virtual/pkgconfig" + +DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO ) + +pkg_pretend() { + # prevent to use external cblas from a previously installed gsl + local current_lib + if use cblas-external; then + current_lib=$(eselect cblas show | cut -d' ' -f2) + if [[ ${current_lib} == gsl ]]; then + ewarn "USE flag cblas-external 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 + fi +} + +src_prepare() { + ESELECT_PROF="gsl" + + # bug 349005 + [[ $(tc-getCC)$ == *gcc* ]] && \ + [[ $(tc-getCC)$ != *apple* ]] && \ + [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \ + && filter-mfpmath sse + 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-external; then + export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" + export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" + fi + econf \ + --enable-shared \ + $(use_with cblas-external) \ + $(use_enable static-libs static) +} + +src_install() { + default + + find "${ED}" -name '*.la' -exec rm -f {} + + + # 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 +} |