[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
commit: 0ac46aea43d5ac971a71263868ffe2940cc58822 Author: Aisha Tammy aisha cc> AuthorDate: Tue Sep 22 12:10:50 2020 + Commit: Aisha Tammy aisha cc> CommitDate: Tue Sep 22 12:10:50 2020 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0ac46aea sci-libs/gsl: drop package present in ::gentoo Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Aisha Tammy aisha.cc> sci-libs/gsl/files/gsl-1.16-cblas-external.patch | 294 sci-libs/gsl/files/gsl-2.1-cblas-external.patch | 326 --- sci-libs/gsl/files/gsl-2.3-cblas-external.patch | 101 --- sci-libs/gsl/gsl-1.16-r2.ebuild | 64 - sci-libs/gsl/gsl-2.1.ebuild | 72 - sci-libs/gsl/gsl-2.3.ebuild | 74 - sci-libs/gsl/gsl-2.4.ebuild | 78 -- sci-libs/gsl/gsl-2.5.ebuild | 78 -- sci-libs/gsl/metadata.xml| 25 -- 9 files changed, 1112 deletions(-) diff --git a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch deleted file mode 100644 index c29ef5294..0 --- a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch +++ /dev/null @@ -1,294 +0,0 @@ -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.0 -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=], -+ [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=], -+ [Pre-processing flags to compile with external cblas ("-I")])], -+ [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"]) -+ ]) -+ 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 -l"]) -+ ]) -+ 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.0 -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
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: 66fede0cb8250476db850b329baa0cfe9df6d3c0 Author: Justin Lecher gentoo org> AuthorDate: Sun Oct 28 06:20:35 2018 + Commit: Justin Lecher gentoo org> CommitDate: Sun Oct 28 06:21:09 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=66fede0c sci-libs/gsl: Version Bump Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sci-libs/gsl/gsl-2.5.ebuild | 78 + 1 file changed, 78 insertions(+) diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild new file mode 100644 index 0..3dda7b878 --- /dev/null +++ b/sci-libs/gsl/gsl-2.5.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit alternatives-2 autotools flag-o-matic multilib-build numeric toolchain-funcs + +DESCRIPTION="GNU Scientific Library" +HOMEPAGE="https://www.gnu.org/software/gsl/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/23" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cblas-external static-libs" + +RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3-cblas-external.patch + ) + +src_prepare() { + default + eautoreconf + multilib_copy_sources +} + +src_configure() { + gsl_configure() { + if use cblas-external; then + export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" + export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" + fi + econf $(use_with cblas-external) + } + # fma flags, which can be enabled by -march=native, cause some tests to fail. + # https://github.com/gentoo/sci/pull/815 + append-cflags $(test-flags-CC -mno-fma -mno-fma4) + + multilib_foreach_abi run_in_build_dir gsl_configure +} + +src_compile() { + multilib_foreach_abi run_in_build_dir default +} + +src_test() { + multilib_foreach_abi run_in_build_dir default +} + +src_install() { + gsl_install() { + local libname=gslcblas + + create_pkgconfig \ + --name "${libname}" \ + --description "${PN} CBLAS implementation" \ + --libs "-l${libname}" \ + --libs-private "-lm" \ + --cflags "-I\${includedir}/${PN}" \ + --version "${PV}" \ + --url "${HOMEPAGE}" \ + "${libname}" + + GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc ) + + default + } + multilib_foreach_abi run_in_build_dir gsl_install + + # Don't add gsl as a cblas alternative if using cblas-external + use cblas-external || alternatives_for cblas gsl 0 \ + ${GSL_ALTERNATIVES[@]} \ + /usr/include/cblas.h gsl/gsl_cblas.h +}
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: 62ddc7e141cc60ceec4fc2f36ffc9ff1b23b6af5 Author: François Bissey gmail com> AuthorDate: Thu Sep 21 05:40:27 2017 + Commit: Benda XU gentoo org> CommitDate: Sat Sep 23 04:59:42 2017 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=62ddc7e1 sci-libs/gsl: bump to gsl-2.4. Change over to https in all ebuilds to keep repoman happy. Closes: https://github.com/gentoo/sci/pull/815 Closes: https://github.com/gentoo/sci/issues/813 Package-Manager: Portage-2.3.8, Repoman-2.3.3 sci-libs/gsl/gsl-1.16-r2.ebuild | 4 ++-- sci-libs/gsl/gsl-2.1.ebuild | 2 +- sci-libs/gsl/gsl-2.3.ebuild | 2 +- sci-libs/gsl/{gsl-2.3.ebuild => gsl-2.4.ebuild} | 10 +++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild index 7c5ef46a1..a28f92b5c 100644 --- a/sci-libs/gsl/gsl-1.16-r2.ebuild +++ b/sci-libs/gsl/gsl-1.16-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ MULTILIB_COMPAT=( abi_x86_{32,64} ) inherit alternatives-2 autotools-multilib eutils toolchain-funcs DESCRIPTION="GNU Scientific Library" -HOMEPAGE="http://www.gnu.org/software/gsl/"; +HOMEPAGE="https://www.gnu.org/software/gsl/"; SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild index 94c797b45..299a889fc 100644 --- a/sci-libs/gsl/gsl-2.1.ebuild +++ b/sci-libs/gsl/gsl-2.1.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit alternatives-2 autotools multilib-build numeric toolchain-funcs DESCRIPTION="GNU Scientific Library" -HOMEPAGE="http://www.gnu.org/software/gsl/"; +HOMEPAGE="https://www.gnu.org/software/gsl/"; SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.3.ebuild index 7af97c8aa..296d8e964 100644 --- a/sci-libs/gsl/gsl-2.3.ebuild +++ b/sci-libs/gsl/gsl-2.3.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit alternatives-2 autotools multilib-build numeric toolchain-funcs DESCRIPTION="GNU Scientific Library" -HOMEPAGE="http://www.gnu.org/software/gsl/"; +HOMEPAGE="https://www.gnu.org/software/gsl/"; SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.4.ebuild similarity index 83% copy from sci-libs/gsl/gsl-2.3.ebuild copy to sci-libs/gsl/gsl-2.4.ebuild index 7af97c8aa..f8cb47e0f 100644 --- a/sci-libs/gsl/gsl-2.3.ebuild +++ b/sci-libs/gsl/gsl-2.4.ebuild @@ -3,14 +3,14 @@ EAPI=6 -inherit alternatives-2 autotools multilib-build numeric toolchain-funcs +inherit alternatives-2 autotools flag-o-matic multilib-build numeric toolchain-funcs DESCRIPTION="GNU Scientific Library" -HOMEPAGE="http://www.gnu.org/software/gsl/"; +HOMEPAGE="https://www.gnu.org/software/gsl/"; SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" -SLOT="0/19" +SLOT="0/23" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="cblas-external static-libs" @@ -36,6 +36,10 @@ src_configure() { fi econf $(use_with cblas-external) } + # fma flags, which can be enabled by -march=native, cause some tests to fail. + # https://github.com/gentoo/sci/pull/815 + append-cflags $(test-flags-CC -mno-fma -mno-fma4) + multilib_foreach_abi run_in_build_dir gsl_configure }
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: 283b7dfd5d637a69faa429db68f8fa66da6db3e8 Author: François Bissey canterbury ac nz> AuthorDate: Sat Mar 4 19:22:39 2017 + Commit: Marius Brehler linux sungazer de> CommitDate: Tue Mar 7 18:59:18 2017 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=283b7dfd sci-libs/gsl: mv 2.1 to 2.1-r1 to ease comparison Package-Manager: portage-2.3.3 sci-libs/gsl/{gsl-2.1-r1.ebuild => gsl-2.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sci-libs/gsl/gsl-2.1-r1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild similarity index 100% rename from sci-libs/gsl/gsl-2.1-r1.ebuild rename to sci-libs/gsl/gsl-2.1.ebuild
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: 05087873dcd1d294a3ae1c0c528b108b90eb01d5 Author: François Bissey canterbury ac nz> AuthorDate: Sat Mar 4 21:26:52 2017 + Commit: Marius Brehler linux sungazer de> CommitDate: Tue Mar 7 18:59:18 2017 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=05087873 sci-libs/gsl: use run_in_build_dir instead of cd ${BUILDDIR}. Move 2.3-r1 to 2.3 to ease review. Package-Manager: portage-2.3.3 sci-libs/gsl/gsl-2.1.ebuild| 18 sci-libs/gsl/{gsl-2.3-r1.ebuild => gsl-2.3.ebuild} | 24 +++--- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild index b26a45748..94c797b45 100644 --- a/sci-libs/gsl/gsl-2.1.ebuild +++ b/sci-libs/gsl/gsl-2.1.ebuild @@ -28,35 +28,25 @@ src_prepare() { src_configure() { gsl_configure() { - cd "${BUILD_DIR}" if use cblas-external; then export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" fi econf $(use_with cblas-external) } - multilib_foreach_abi gsl_configure + multilib_foreach_abi run_in_build_dir gsl_configure } src_compile() { - gsl_compile() { - cd "${BUILD_DIR}" - default - } - multilib_foreach_abi gsl_compile + multilib_foreach_abi run_in_build_dir default } src_test() { - gsl_test() { - cd "${BUILD_DIR}" - default - } - multilib_foreach_abi gsl_test + multilib_foreach_abi run_in_build_dir default } src_install() { gsl_install() { - cd "${BUILD_DIR}" local libname=gslcblas create_pkgconfig \ @@ -73,7 +63,7 @@ src_install() { default } - multilib_foreach_abi gsl_install + multilib_foreach_abi run_in_build_dir gsl_install # Don't add gsl as a cblas alternative if using cblas-external use cblas-external || alternatives_for cblas gsl 0 \ diff --git a/sci-libs/gsl/gsl-2.3-r1.ebuild b/sci-libs/gsl/gsl-2.3.ebuild similarity index 85% rename from sci-libs/gsl/gsl-2.3-r1.ebuild rename to sci-libs/gsl/gsl-2.3.ebuild index 95b4344be..609c0cb62 100644 --- a/sci-libs/gsl/gsl-2.3-r1.ebuild +++ b/sci-libs/gsl/gsl-2.3.ebuild @@ -30,27 +30,25 @@ src_prepare() { src_configure() { gsl_configure() { - cd "${BUILD_DIR}" if use cblas-external; then export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" fi econf $(use_with cblas-external) } - multilib_foreach_abi gsl_configure + multilib_foreach_abi run_in_build_dir gsl_configure } src_compile() { - gsl_compile() { - cd "${BUILD_DIR}" - default - } - multilib_foreach_abi gsl_compile + multilib_foreach_abi run_in_build_dir default +} + +src_test() { + multilib_foreach_abi run_in_build_dir default } src_install() { gsl_install() { - cd "${BUILD_DIR}" local libname=gslcblas create_pkgconfig \ @@ -67,18 +65,10 @@ src_install() { default } - multilib_foreach_abi gsl_install + multilib_foreach_abi run_in_build_dir gsl_install # Don't add gsl as a cblas alternative if using cblas-external use cblas-external || alternatives_for cblas gsl 0 \ ${GSL_ALTERNATIVES[@]} \ /usr/include/cblas.h gsl/gsl_cblas.h } - -src_test() { - gsl_test() { - cd "${BUILD_DIR}" - default - } - multilib_foreach_abi gsl_test -}
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: ea25aa461fffa2684f7a81fbdaf151f62e46f1f6 Author: François Bissey canterbury ac nz> AuthorDate: Sat Mar 4 21:40:01 2017 + Commit: Marius Brehler linux sungazer de> CommitDate: Tue Mar 7 18:59:18 2017 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ea25aa46 sci-libs/gsl: restore keywords to its original state in 2.3 Package-Manager: portage-2.3.3 sci-libs/gsl/gsl-2.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.3.ebuild index 609c0cb62..7af97c8aa 100644 --- a/sci-libs/gsl/gsl-2.3.ebuild +++ b/sci-libs/gsl/gsl-2.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/19" -KEYWORDS="~amd64 ~mips ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="cblas-external static-libs" RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
commit: 69a4b2c57b5bcbb06dd7b6bd6f182abfe936fa6c Author: François Bissey canterbury ac nz> AuthorDate: Sat Mar 4 04:26:28 2017 + Commit: Marius Brehler linux sungazer de> CommitDate: Tue Mar 7 18:59:18 2017 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=69a4b2c5 sci-libs/gsl: remove int64 support since it doesn't exist upstream. Bump the ebuild as the current one produce broken install for the gslcblas alternative. Package-Manager: portage-2.3.3 sci-libs/gsl/files/gsl-2.3-cblas-external.patch | 1402 +-- sci-libs/gsl/gsl-2.1-r1.ebuild | 82 ++ sci-libs/gsl/gsl-2.1.ebuild | 78 -- sci-libs/gsl/gsl-2.3-r1.ebuild | 84 ++ sci-libs/gsl/gsl-2.3.ebuild | 78 -- sci-libs/gsl/metadata.xml |1 - 6 files changed, 175 insertions(+), 1550 deletions(-) diff --git a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch index 7e12b370b..38b25aacc 100644 --- a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch +++ b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch @@ -1,36 +1,3 @@ - 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 @@ -66,188 +33,6 @@ index c522001..4513bc8 100644 -e 's|@LIBS[@]|$(LIBS)|g' \ -e 's|@VERSION[@]|$(VERSION)|g' -diff --git a/Makefile.am.porig b/Makefile.am.porig -new file mode 100644 -index 000..c522001 /dev/null -+++ b/Makefile.am.porig -@@ -0,0 +1,66 @@ -+## Process this file with automake to produce Makefile.in -+ -+# AUTOMAKE_OPTIONS = readme-alpha -+ -+SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multifit_nlinear multilarge multilarge_nlinear rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc -+ -+SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multifit_nlinear/libgslmultifit_nlinear.la multilarge/libgslmultilarge.la multilarge_nlinear/libgslmultilarge_nlinear.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la ode-initval2/libgslodeiv2.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgsls pecfunc.la rstat/libgslrstat.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la spmatrix/libgslspmatrix.la spblas/libgslspblas.la splinalg/libgslsplinalg.la -+ -+pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_i
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/, sci-libs/gsl/files/
commit: b532e9b7adc91fe231a67da6c9c75f6f0af84d38 Author: Justin Lecher gentoo org> AuthorDate: Sat Dec 10 10:47:47 2016 + Commit: Justin Lecher gentoo org> CommitDate: Sat Dec 10 10:47:47 2016 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b532e9b7 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/files/gsl-2.3-cblas-external.patch | 1485 +++ sci-libs/gsl/gsl-2.3.ebuild | 79 ++ 2 files changed, 1564 insertions(+) diff --git a/sci-libs/gsl/files/gsl-2.3-cblas-external.patch b/sci-libs/gsl/files/gsl-2.3-cblas-external.patch new file mode 100644 index 000..7e12b37 --- /dev/null +++ b/sci-libs/gsl/files/gsl-2.3-cblas-external.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 @@ 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/Makefile.am.porig b/Makefile.am.porig +new file mode 100644 +index 000..c522001 +--- /dev/null b/Makefile.am.porig +@@ -0,0 +1,66 @@ ++## Process this file with automake to produce Makefile.in ++ ++# AUTOMAKE_OPTIONS = readme-alpha ++ ++SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multifit_nlinear multilarge multilarge_nlinear rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc ++ ++SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multifit_nlinear/libgslmultifit_nlinear.la multilarge/libgslmultilarge.la multilarge_nlinear/libgslmultilarge_nlinear.la multimin/libgslmultimin.la multiroots/libgslmultiro
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/, sci-biology/signalp/, sci-biology/fastdnaml/, ...
commit: d1b1268845627553e3b15302a1d35e4bee8333ea Author: Justin Lecher gentoo org> AuthorDate: Sun Mar 6 20:54:08 2016 + Commit: Justin Lecher gentoo org> CommitDate: Sun Mar 6 20:54:08 2016 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d1b12688 Fix invalid metadata.xml syntax Signed-off-by: Justin Lecher gentoo.org> dev-libs/intel-common/metadata.xml| 2 -- sci-biology/blasr/metadata.xml| 4 sci-biology/brat/metadata.xml | 4 sci-biology/codonw/metadata.xml | 4 sci-biology/erpin/metadata.xml| 4 sci-biology/estscan/metadata.xml | 2 -- sci-biology/fastdnaml/metadata.xml| 4 sci-biology/gbrowse/metadata.xml | 9 +++-- sci-biology/genepop/metadata.xml | 4 sci-biology/grappa/metadata.xml | 6 +- sci-biology/igv/metadata.xml | 4 sci-biology/mavid/metadata.xml| 4 sci-biology/merlin/metadata.xml | 4 sci-biology/miranda/metadata.xml | 4 sci-biology/mosaik/metadata.xml | 4 sci-biology/mreps/metadata.xml| 4 sci-biology/mrfast/metadata.xml | 4 sci-biology/mrsfast/metadata.xml | 4 sci-biology/ncbi-blast+/metadata.xml | 16 sci-biology/ncbi-tools++/metadata.xml | 20 sci-biology/quicktree/metadata.xml| 4 sci-biology/rnaplex/metadata.xml | 4 sci-biology/signalp/metadata.xml | 4 sci-biology/tmhmm/metadata.xml| 4 sci-biology/twinscan/metadata.xml | 4 sci-chemistry/nwchem/metadata.xml | 12 sci-chemistry/rosetta/metadata.xml| 2 +- sci-libs/bigdft-abi/metadata.xml | 8 sci-libs/ghmm/metadata.xml| 4 sci-libs/gsl/metadata.xml | 2 -- sci-libs/mkl/metadata.xml | 2 -- sci-libs/trilinos/metadata.xml| 8 +--- sci-physics/abinit/metadata.xml | 30 -- sci-physics/atompaw/metadata.xml | 4 +--- sci-physics/bigdft/metadata.xml | 8 sci-physics/elk/metadata.xml | 4 sys-cluster/hpl/metadata.xml | 5 - 37 files changed, 11 insertions(+), 209 deletions(-) diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml index b4d319f..f880bd7 100644 --- a/dev-libs/intel-common/metadata.xml +++ b/dev-libs/intel-common/metadata.xml @@ -11,8 +11,6 @@ Install the libraries needed for the icc and ifort compilers - - Install the libraries needed for supporting Intel Many Integrated Core (Xeon Phi) diff --git a/sci-biology/blasr/metadata.xml b/sci-biology/blasr/metadata.xml index 4ef78c3..004c995 100644 --- a/sci-biology/blasr/metadata.xml +++ b/sci-biology/blasr/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - -wea...@gentoo.org -Andrey Kislyuk - sci-biol...@gentoo.org Gentoo Biology Project diff --git a/sci-biology/brat/metadata.xml b/sci-biology/brat/metadata.xml index 4ef78c3..004c995 100644 --- a/sci-biology/brat/metadata.xml +++ b/sci-biology/brat/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - -wea...@gentoo.org -Andrey Kislyuk - sci-biol...@gentoo.org Gentoo Biology Project diff --git a/sci-biology/codonw/metadata.xml b/sci-biology/codonw/metadata.xml index 6242070..f66d7b7 100644 --- a/sci-biology/codonw/metadata.xml +++ b/sci-biology/codonw/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - -wea...@gentoo.org -Andrey Kislyuk - sci-biol...@gentoo.org Gentoo Biology Project diff --git a/sci-biology/erpin/metadata.xml b/sci-biology/erpin/metadata.xml index 4ef78c3..004c995 100644 --- a/sci-biology/erpin/metadata.xml +++ b/sci-biology/erpin/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - -wea...@gentoo.org -Andrey Kislyuk - sci-biol...@gentoo.org Gentoo Biology Project diff --git a/sci-biology/estscan/metadata.xml b/sci-biology/estscan/metadata.xml index 462149b..d709341 100644 --- a/sci-biology/estscan/metadata.xml +++ b/sci-biology/estscan/metadata.xml @@ -11,8 +11,6 @@ Undocumented USE - - Undocumented USE diff --git a/sci-biology/fastdnaml/metadata.xml b/sci-biology/fastdnaml/metadata.xml index 4ef78c3..004c995 100644 --- a/sci-biology/fastdnaml/metadata.xml +++ b/sci-biology/fastdnaml/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - -wea...@gentoo.org -Andrey Kislyuk - sci-biol...@gentoo.org Gentoo Biology Project diff --git a/sci-biology/gbrowse/metadata.xml b/sci-biology/gbrowse/metadata.xml index 6e0ee19..d0116db 100644 --- a/sci-biology/gbrowse/metadata.xml +++ b/sci-biology/gbrowse/metadata.xml @@ -1,17 +1,14 @@ http://www
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: 99655e523db39a13c683be7e39e0bf2104fec652 Author: Justin Lecher gentoo org> AuthorDate: Fri Feb 26 09:30:11 2016 + Commit: Justin Lecher gentoo org> CommitDate: Fri Feb 26 09:30:11 2016 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=99655e52 sci-libs/gsl: Set MULTILIB_COMPAT for x86 Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> sci-libs/gsl/gsl-1.16-r2.ebuild | 5 +++-- sci-libs/gsl/gsl-2.1.ebuild | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild index 6fbf5d3..e00f2d3 100644 --- a/sci-libs/gsl/gsl-1.16-r2.ebuild +++ b/sci-libs/gsl/gsl-1.16-r2.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 AUTOTOOLS_AUTORECONF=1 +MULTILIB_COMPAT=( abi_x86_{32,64} ) inherit alternatives-2 autotools-multilib eutils toolchain-funcs @@ -14,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 ~mips ~s390 ~sh ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="cblas-external static-libs" RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )" diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild index afb0c6a..28c850c 100644 --- a/sci-libs/gsl/gsl-2.1.ebuild +++ b/sci-libs/gsl/gsl-2.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/19" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 ~mips ~s390 ~sh ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="cblas-external static-libs" RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: f0160cfce0dcc6b8e67f5cc8e8cbadf8acd26299 Author: Justin Lecher gentoo org> AuthorDate: Fri Feb 12 09:54:17 2016 + Commit: Justin Lecher gentoo org> CommitDate: Fri Feb 12 09:54:17 2016 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f0160cfc sci-libs/gsl: Add subslot Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> sci-libs/gsl/gsl-2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild index 2a95c67..afb0c6a 100644 --- a/sci-libs/gsl/gsl-2.1.ebuild +++ b/sci-libs/gsl/gsl-2.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/gsl/"; SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" -SLOT="0" +SLOT="0/19" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="cblas-external static-libs"
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/files/, sci-libs/gsl/
commit: 6e79edc188125e344b4edc354f1b9fc418561f71 Author: Justin Lecher gentoo org> AuthorDate: Fri Feb 12 09:25:59 2016 + Commit: Justin Lecher gentoo org> CommitDate: Fri Feb 12 09:25:59 2016 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6e79edc1 sci-libs/gsl: Version Bump Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> sci-libs/gsl/files/gsl-2.1-cblas-external.patch | 326 sci-libs/gsl/gsl-2.1.ebuild | 79 ++ sci-libs/gsl/metadata.xml | 3 + 3 files changed, 408 insertions(+) diff --git a/sci-libs/gsl/files/gsl-2.1-cblas-external.patch b/sci-libs/gsl/files/gsl-2.1-cblas-external.patch new file mode 100644 index 000..54cc880 --- /dev/null +++ b/sci-libs/gsl/files/gsl-2.1-cblas-external.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, ++ [AS_HELP_STRING([--with-cblas-external-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=], ++ [Pre-processing flags to compile with external cblas ("-I")])], ++ [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"]) ++ ]) ++ 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([ ++
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: 83bbe850f91ca9ffd05dc7dd6a0051ecb50b1fd2 Author: Justin Lecher gentoo org> AuthorDate: Tue Jun 16 13:32:19 2015 + Commit: Justin Lecher gentoo org> CommitDate: Tue Jun 16 13:32:19 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=83bbe850 sci-libs/gsl: Fix problems during installation with multilib and alternatives, https://github.com/gentoo-science/sci/issues/438 Package-Manager: portage-2.2.20 sci-libs/gsl/ChangeLog | 7 - sci-libs/gsl/gsl-1.16-r1.ebuild | 60 - sci-libs/gsl/gsl-1.16-r2.ebuild | 8 -- sci-libs/gsl/metadata.xml | 10 +++ 4 files changed, 17 insertions(+), 68 deletions(-) diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog index 0ffe3bd..936c4df 100644 --- a/sci-libs/gsl/ChangeLog +++ b/sci-libs/gsl/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for sci-libs/gsl -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $ + 16 Jun 2015; Justin Lecher -gsl-1.16-r1.ebuild, + gsl-1.16-r2.ebuild, metadata.xml: + sci-libs/gsl: Fix problems during installation with multilib and alternatives, + https://github.com/gentoo-science/sci/issues/438 + *gsl-1.16-r2 (10 Nov 2014) 10 Nov 2014; Christoph Junghans +gsl-1.16-r2.ebuild: diff --git a/sci-libs/gsl/gsl-1.16-r1.ebuild b/sci-libs/gsl/gsl-1.16-r1.ebuild deleted file mode 100644 index f19bba1..000 --- a/sci-libs/gsl/gsl-1.16-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 - -inherit alternatives-2 autotools-utils eutils toolchain-funcs - -DESCRIPTION="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 ~x64-macos ~sparc-solaris ~x86-solaris" -IUSE="cblas-external static-libs" - -RDEPEND="cblas-external? ( virtual/cblas )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch ) - -src_configure() { - if use cblas-external; then - export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" - export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" - fi - local myeconfargs=( - $(use_with cblas-external) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - local libname=gslcblas - - cat <<-EOF > ${libname}.pc - prefix=${EPREFIX}/usr - libdir=\${prefix}/$(get_libdir) - includedir=\${prefix}/include - Name: ${libname} - Description: ${DESCRIPTION} CBLAS implementation - Version: ${PV} - URL: ${HOMEPAGE} - Libs: -L\${libdir} -l${libname} - Libs.private: -lm - Cflags: -I\${includedir} - EOF - insinto /usr/$(get_libdir)/pkgconfig - doins ${libname}.pc - - # Don't add gsl as a cblas alternative if using cblas-external - use cblas-external || alternatives_for cblas gsl 0 \ - /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc \ - /usr/include/cblas.h gsl/gsl_cblas.h -} diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild index 7cf4402..fada147 100644 --- a/sci-libs/gsl/gsl-1.16-r2.ebuild +++ b/sci-libs/gsl/gsl-1.16-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -53,8 +53,12 @@ multilib_src_install() { insinto /usr/$(get_libdir)/pkgconfig doins ${libname}.pc + GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc ) +} + +multilib_src_install_all() { # Don't add gsl as a cblas alternative if using cblas-external use cblas-external || alternatives_for cblas gsl 0 \ - /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc \ + ${GSL_ALTERNATIVES[@]} \ /usr/include/cblas.h gsl/gsl_cblas.h } diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml index 9be87ca..2d7f4e7 100644 --- a/sci-libs/gsl/metadata.xml +++ b/sci-libs/gsl/metadata.xml @@ -1,8 +1,8 @@ http://www.gentoo.org/dtd/metadata.dtd";> -sci - + sci + The GNU Scientific Library (GSL) is a collection of routines for numerical analysis. The routines are written from scratch by the GSL team in C, and present a modern API for C programmers, while al
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: abe549ffad5e6e319ca9947fa96e65f443ef6012 Author: Christoph Junghans gentoo org> AuthorDate: Mon Nov 10 23:25:42 2014 + Commit: Christoph Junghans gentoo org> CommitDate: Mon Nov 10 23:25:42 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=abe549ff added multilib support (bug #528622) Package-Manager: portage-2.2.8-r2 --- sci-libs/gsl/ChangeLog | 5 sci-libs/gsl/gsl-1.16-r2.ebuild | 60 + 2 files changed, 65 insertions(+) diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog index 81ecb25..0ffe3bd 100644 --- a/sci-libs/gsl/ChangeLog +++ b/sci-libs/gsl/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $ +*gsl-1.16-r2 (10 Nov 2014) + + 10 Nov 2014; Christoph Junghans +gsl-1.16-r2.ebuild: + added multilib support (bug #528622) + 02 Jul 2014; François Bissey gsl-1.16-r1.ebuild: Tested on x64-macos, keywording. diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild new file mode 100644 index 000..7cf4402 --- /dev/null +++ b/sci-libs/gsl/gsl-1.16-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 + +inherit alternatives-2 autotools-multilib eutils toolchain-funcs + +DESCRIPTION="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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris" +IUSE="cblas-external static-libs" + +RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch ) + +src_configure() { + if use cblas-external; then + export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" + export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" + fi + local myeconfargs=( + $(use_with cblas-external) + ) + autotools-multilib_src_configure +} + +multilib_src_install() { + autotools-utils_src_install + local libname=gslcblas + + cat <<-EOF > ${libname}.pc + prefix=${EPREFIX}/usr + libdir=\${prefix}/$(get_libdir) + includedir=\${prefix}/include + Name: ${libname} + Description: ${DESCRIPTION} CBLAS implementation + Version: ${PV} + URL: ${HOMEPAGE} + Libs: -L\${libdir} -l${libname} + Libs.private: -lm + Cflags: -I\${includedir} + EOF + insinto /usr/$(get_libdir)/pkgconfig + doins ${libname}.pc + + # Don't add gsl as a cblas alternative if using cblas-external + use cblas-external || alternatives_for cblas gsl 0 \ + /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc \ + /usr/include/cblas.h gsl/gsl_cblas.h +}
[gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
commit: 4a1bb90c574ea27b61d9ff5d70ac4ec88763a0e2 Author: François Bissey canterbury ac nz> AuthorDate: Wed Jul 2 00:09:01 2014 + Commit: Francois Bissey massey ac nz> CommitDate: Wed Jul 2 00:09:01 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4a1bb90c Tested on x64-macos, keywording. Package-Manager: portage-2.2.10 --- sci-libs/gsl/ChangeLog | 6 +- sci-libs/gsl/gsl-1.16-r1.ebuild | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog index f35223d..81ecb25 100644 --- a/sci-libs/gsl/ChangeLog +++ b/sci-libs/gsl/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-libs/gsl -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $ + 02 Jul 2014; François Bissey + gsl-1.16-r1.ebuild: + Tested on x64-macos, keywording. + *gsl-1.16-r1 (19 Aug 2013) 19 Aug 2013; Sébastien Fabbro diff --git a/sci-libs/gsl/gsl-1.16-r1.ebuild b/sci-libs/gsl/gsl-1.16-r1.ebuild index c1fd0e5..f19bba1 100644 --- a/sci-libs/gsl/gsl-1.16-r1.ebuild +++ b/sci-libs/gsl/gsl-1.16-r1.ebuild @@ -14,7 +14,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="cblas-external static-libs" RDEPEND="cblas-external? ( virtual/cblas )"