[gentoo-commits] repo/gentoo:master commit in: sci-libs/gsl/, sci-libs/gsl/files/
commit: 24e7ec9028ec04695b9baba6d1424af3afd588bf Author: David Seifert gentoo org> AuthorDate: Sun Oct 24 22:09:04 2021 + Commit: David Seifert gentoo org> CommitDate: Sun Oct 24 22:09:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24e7ec90 sci-libs/gsl: drop 1.16, 2.5-r1 Closes: https://github.com/gentoo/gentoo/pull/22607 Signed-off-by: David Seifert gentoo.org> sci-libs/gsl/Manifest| 4 -- sci-libs/gsl/files/cblas.pc.in | 12 sci-libs/gsl/files/eselect.cblas.gsl | 5 -- sci-libs/gsl/gsl-1.16.ebuild | 108 --- sci-libs/gsl/gsl-2.5-r1.ebuild | 59 --- 5 files changed, 188 deletions(-) diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index 099284fea1d..79e6a006700 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -1,6 +1,2 @@ -DIST gsl-1.16-cblas.patch.bz2 2810 BLAKE2B 364c9f93a386e5d95c86789a3c00231cdfbe588fe4371ae85447bc6574b7798721a8559fda747ee656de96e7d8c5657901db86dc9c59bcee27789c918222e38f SHA512 55a2dab850697b1e378ecf64d299ed6f021f1b1eb7dbad749f5014e5b7f275ec6c981a5699a87969c4d0794677efa51a5a2317526b58ca96aabb3f6a68cabd81 -DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb -DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23 -DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997cf980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5 diff --git a/sci-libs/gsl/files/cblas.pc.in b/sci-libs/gsl/files/cblas.pc.in deleted file mode 100644 index a2580f85e6e..000 --- 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/eselect.cblas.gsl b/sci-libs/gsl/files/eselect.cblas.gsl deleted file mode 100644 index af6fee51fef..000 --- 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/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild deleted file mode 100644 index eac9c3b6f75..000 --- a/sci-libs/gsl/gsl-1.16.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit epatch flag-o-matic autotools toolchain-funcs - -DESCRIPTION="The GNU Scientific Library" -HOMEPAGE="https://www.gnu.org/software/gsl/; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz - https://dev.gentoo.org/~mgorny/dist/${P}-cblas.patch.bz2; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="cblas-external static-libs" - -RDEPEND=" - cblas-external? ( virtual/cblas ) - app-eselect/eselect-cblas" -DEPEND="${RDEPEND} - 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
[gentoo-commits] repo/gentoo:master commit in: sci-libs/gsl/, sci-libs/gsl/files/
commit: f16d09b80f010f9395c41daf9b0fd2803bb43b15 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 17 18:12:09 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 17 18:35:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f16d09b8 sci-libs/gsl: Drop old Closes: https://github.com/gentoo/gentoo/pull/6572 sci-libs/gsl/Manifest | 2 - sci-libs/gsl/files/gsl-2.1-cblas.patch | 326 - sci-libs/gsl/gsl-2.1.ebuild| 108 --- sci-libs/gsl/gsl-2.3.ebuild| 111 --- 4 files changed, 547 deletions(-) diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index fd13241e5b0..94248f35473 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -1,4 +1,2 @@ DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb -DIST gsl-2.1.tar.gz 3827265 BLAKE2B 2b359dc9f74ed69aa033508923cff4541894c26a6d2e5c606ee5cf4e4e95c58d270351998537c8c4f4bc8130ee5870b6f64133ede9079f20d8309d83637164f5 SHA512 d63660fdfae9c9ec9f4fd1894b0af705297cefb6169973ef10faacd0b8a3d52f537508e9c07f4f9f4253138cc48e5570bb10ef303538226d7febd92e8fd184b0 -DIST gsl-2.3.tar.gz 4510731 BLAKE2B 5bc58346340a04f039405d4b256598b14f33e9b4e265c4fb159e691f5ea3372a0f9b7526b6ea6e259d5968ef8e7ce5b4d4e2465a78fb0b42f85a383fdc32d4bf SHA512 ada622079f4ac667d95f74b38aa368726fc1b18fd34555bcefe90920d3da93a9289ebff966be43325af806107001bc8973daf9f8418e6c97b866be2296b566ff DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff2a8c755451fe7e10c8e2d80e3fcc601508c5e9942e4cfd05e51c43ba9326b760e4390eb0c2552886 SHA512 12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130 diff --git a/sci-libs/gsl/files/gsl-2.1-cblas.patch b/sci-libs/gsl/files/gsl-2.1-cblas.patch deleted file mode 100644 index 54cc8802c59..000 --- a/sci-libs/gsl/files/gsl-2.1-cblas.patch +++ /dev/null @@ -1,326 +0,0 @@ - Makefile.am | 8 +++--- - ax_cblas.m4 | 69 +++ - bspline/Makefile.am | 2 +- - configure.ac | 10 +++ - eigen/Makefile.am | 2 +- - gsl-config.in | 4 +-- - gsl.pc.in | 2 +- - interpolation/Makefile.am | 2 +- - linalg/Makefile.am| 2 +- - multifit/Makefile.am | 4 +-- - multimin/Makefile.am | 4 +-- - multiroots/Makefile.am| 2 +- - ode-initval/Makefile.am | 2 +- - poly/Makefile.am | 2 +- - specfunc/Makefile.am | 2 +- - wavelet/Makefile.am | 2 +- - 16 files changed, 100 insertions(+), 19 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 278dcd9..a75418c 100644 a/Makefile.am -+++ b/Makefile.am -@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe - - lib_LTLIBRARIES = libgsl.la - libgsl_la_SOURCES = version.c --libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) -+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@ - libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION) - noinst_HEADERS = templates_on.h templates_off.h build.h - -@@ -29,10 +29,10 @@ 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_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 -@@ -51,6 +51,8 @@ edit = $(SED) \ - -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' - -diff --git a/ax_cblas.m4 b/ax_cblas.m4 -new file mode 100644 -index 000..6ef143a /dev/null -+++ b/ax_cblas.m4 -@@ -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"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/gsl/, sci-libs/gsl/files/
commit: d5ed0ab57fe91b92c0a38068e44829cc10a54ba7 Author: Justin Lecher gentoo org> AuthorDate: Sat Dec 10 10:15:36 2016 + Commit: Justin Lecher gentoo org> CommitDate: Sat Dec 10 10:15:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ed0ab5 sci-libs/gsl: Version Bump Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=602200 Package-Manager: portage-2.3.3 Signed-off-by: Justin Lecher gentoo.org> sci-libs/gsl/Manifest |1 + sci-libs/gsl/files/gsl-2.3-cblas.patch | 1485 sci-libs/gsl/gsl-2.3.ebuild| 109 +++ 3 files changed, 1595 insertions(+) diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index c1ca4bc..e8d4f65 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -1,3 +1,4 @@ DIST gsl-1.14.tar.gz 3128269 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb SHA512 ac8d9ba4d6e3f5d698e86130af4b4218d36b22525e966ba5d7b47d44f7ad1bef19287efa05f6ad63a81e676179bd3a0bd19461f8383e85a4d674835ff69fcc42 WHIRLPOOL ddc6637b95ad5b2c3943f067f9979fc3070204a04a85e82365c8fd6aec6685a2827bea7056138139893f7bb6cc449318797d235dfe5fee525b1b519927148b0b DIST gsl-1.16.tar.gz 3534080 SHA256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb WHIRLPOOL 46bf814c882ca36600d258097642a734b6a6483302cc64c14cab55c0c056ae6116c204495b3b81c57fec1871e145fbc5aa396e52e494e9e2fcd34ec06301 DIST gsl-2.1.tar.gz 3827265 SHA256 59ad06837397617f698975c494fe7b2b698739a59e2fcf830b776428938a0c66 SHA512 d63660fdfae9c9ec9f4fd1894b0af705297cefb6169973ef10faacd0b8a3d52f537508e9c07f4f9f4253138cc48e5570bb10ef303538226d7febd92e8fd184b0 WHIRLPOOL 60aa8ea8d19bc88ace49fcb807f63877d3bd32ff5c9bbca0db9d45b55b3929bba93756f82ce8777be852ca9b015e425540b33091a58ea7edac0d74560cbe39a5 +DIST gsl-2.3.tar.gz 4510731 SHA256 562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb SHA512 ada622079f4ac667d95f74b38aa368726fc1b18fd34555bcefe90920d3da93a9289ebff966be43325af806107001bc8973daf9f8418e6c97b866be2296b566ff WHIRLPOOL f6c597f88ccc4b98002f3887a0268f4964c2c6243196e1fd862f3c7360798900a8cfa4d739b9876b13b71481d175904d1577b6b059a31aa16156fe9fc3848ea5 diff --git a/sci-libs/gsl/files/gsl-2.3-cblas.patch b/sci-libs/gsl/files/gsl-2.3-cblas.patch new file mode 100644 index ..7e12b37 --- /dev/null +++ b/sci-libs/gsl/files/gsl-2.3-cblas.patch @@ -0,0 +1,1485 @@ + Makefile.am | 8 +- + Makefile.am.porig | 66 + ax_cblas.m4 | 69 + + bspline/Makefile.am | 2 +- + bspline/Makefile.am.porig | 17 ++ + configure.ac| 10 + + configure.ac.porig | 647 + eigen/Makefile.am | 2 +- + eigen/Makefile.am.porig | 18 ++ + gsl-config.in | 4 +- + gsl-config.in.porig | 80 + + gsl.pc.in | 2 +- + gsl.pc.in.porig | 11 + + interpolation/Makefile.am | 2 +- + interpolation/Makefile.am.porig | 18 ++ + linalg/Makefile.am | 2 +- + linalg/Makefile.am.porig| 16 + + multifit/Makefile.am| 4 +- + multifit/Makefile.am.porig | 74 + + multimin/Makefile.am| 4 +- + multimin/Makefile.am.porig | 20 ++ + multiroots/Makefile.am | 2 +- + multiroots/Makefile.am.porig| 19 ++ + ode-initval/Makefile.am | 2 +- + ode-initval/Makefile.am.porig | 18 ++ + poly/Makefile.am| 2 +- + poly/Makefile.am.porig | 17 ++ + specfunc/Makefile.am| 2 +- + specfunc/Makefile.am.porig | 19 ++ + wavelet/Makefile.am | 2 +- + wavelet/Makefile.am.porig | 17 ++ + 31 files changed, 1157 insertions(+), 19 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c522001..4513bc8 100644 +--- a/Makefile.am b/Makefile.am +@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe + + lib_LTLIBRARIES = libgsl.la + libgsl_la_SOURCES = version.c +-libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) ++libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@ + libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION) + noinst_HEADERS = templates_on.h templates_off.h build.h + +@@ -29,10 +29,10 @@ 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_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 +@@ -51,6 +51,8 @@
[gentoo-commits] repo/gentoo:master commit in: sci-libs/gsl/, sci-libs/gsl/files/
commit: 2009725ba075a7575ec01dde4cb307f0aa55ae4a Author: Justin Lecher gentoo org> AuthorDate: Fri Feb 12 08:15:38 2016 + Commit: Justin Lecher gentoo org> CommitDate: Fri Feb 12 09:24:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2009725b sci-libs/gsl: Version Bump Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=574402 Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> sci-libs/gsl/Manifest | 1 + sci-libs/gsl/files/gsl-2.1-cblas.patch | 326 + sci-libs/gsl/gsl-2.1.ebuild| 109 +++ 3 files changed, 436 insertions(+) diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index ef0c40f..c1ca4bc 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -1,2 +1,3 @@ DIST gsl-1.14.tar.gz 3128269 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb SHA512 ac8d9ba4d6e3f5d698e86130af4b4218d36b22525e966ba5d7b47d44f7ad1bef19287efa05f6ad63a81e676179bd3a0bd19461f8383e85a4d674835ff69fcc42 WHIRLPOOL ddc6637b95ad5b2c3943f067f9979fc3070204a04a85e82365c8fd6aec6685a2827bea7056138139893f7bb6cc449318797d235dfe5fee525b1b519927148b0b DIST gsl-1.16.tar.gz 3534080 SHA256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb WHIRLPOOL 46bf814c882ca36600d258097642a734b6a6483302cc64c14cab55c0c056ae6116c204495b3b81c57fec1871e145fbc5aa396e52e494e9e2fcd34ec06301 +DIST gsl-2.1.tar.gz 3827265 SHA256 59ad06837397617f698975c494fe7b2b698739a59e2fcf830b776428938a0c66 SHA512 d63660fdfae9c9ec9f4fd1894b0af705297cefb6169973ef10faacd0b8a3d52f537508e9c07f4f9f4253138cc48e5570bb10ef303538226d7febd92e8fd184b0 WHIRLPOOL 60aa8ea8d19bc88ace49fcb807f63877d3bd32ff5c9bbca0db9d45b55b3929bba93756f82ce8777be852ca9b015e425540b33091a58ea7edac0d74560cbe39a5 diff --git a/sci-libs/gsl/files/gsl-2.1-cblas.patch b/sci-libs/gsl/files/gsl-2.1-cblas.patch new file mode 100644 index 000..54cc880 --- /dev/null +++ b/sci-libs/gsl/files/gsl-2.1-cblas.patch @@ -0,0 +1,326 @@ + Makefile.am | 8 +++--- + ax_cblas.m4 | 69 +++ + bspline/Makefile.am | 2 +- + configure.ac | 10 +++ + eigen/Makefile.am | 2 +- + gsl-config.in | 4 +-- + gsl.pc.in | 2 +- + interpolation/Makefile.am | 2 +- + linalg/Makefile.am| 2 +- + multifit/Makefile.am | 4 +-- + multimin/Makefile.am | 4 +-- + multiroots/Makefile.am| 2 +- + ode-initval/Makefile.am | 2 +- + poly/Makefile.am | 2 +- + specfunc/Makefile.am | 2 +- + wavelet/Makefile.am | 2 +- + 16 files changed, 100 insertions(+), 19 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 278dcd9..a75418c 100644 +--- a/Makefile.am b/Makefile.am +@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe + + lib_LTLIBRARIES = libgsl.la + libgsl_la_SOURCES = version.c +-libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) ++libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@ + libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION) + noinst_HEADERS = templates_on.h templates_off.h build.h + +@@ -29,10 +29,10 @@ 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_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 +@@ -51,6 +51,8 @@ edit = $(SED) \ + -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' + +diff --git a/ax_cblas.m4 b/ax_cblas.m4 +new file mode 100644 +index 000..6ef143a +--- /dev/null b/ax_cblas.m4 +@@ -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, ++