From 6438b14169223c6931a87dd4e1e357934b2c0852 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 1 Mar 2023 04:05:50 +0000 Subject: gentoo auto-resync : 01:03:2023 - 04:05:50 --- sci-libs/gsl/Manifest | 3 +- .../gsl/files/gsl-2.7.1-configure-clang16.patch | 26 +++++++++ sci-libs/gsl/gsl-2.7.1-r1.ebuild | 59 --------------------- sci-libs/gsl/gsl-2.7.1-r2.ebuild | 61 ++++++++++++++++++++++ 4 files changed, 89 insertions(+), 60 deletions(-) create mode 100644 sci-libs/gsl/files/gsl-2.7.1-configure-clang16.patch delete mode 100644 sci-libs/gsl/gsl-2.7.1-r1.ebuild create mode 100644 sci-libs/gsl/gsl-2.7.1-r2.ebuild (limited to 'sci-libs/gsl') diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index b8e1689c96e2..b0061333a245 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -1,4 +1,5 @@ +AUX gsl-2.7.1-configure-clang16.patch 806 BLAKE2B 5b3552d9ad70de9100a77cdf822fc684c11798af9c53c22c1b12617483371ab143c84c6ec1564f0c43702ed490bf69346067c032b66a439e4a1f0a14f28b2b91 SHA512 3f7c67c1a0430c0e179118f341cda31334286c68d3945368f4c013354e9122d6e3c8fbda891d2654557895187197fdc0e2a512b1dd499bc4c936d87dea63adf0 DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131 -EBUILD gsl-2.7.1-r1.ebuild 1324 BLAKE2B 332fc0cc07608637b56ffaca93fc55bb92e4e7f8ddb2d57591a5decb3cc3d19c535e84b6c114b1c0772f501c7a715cd94cc8356980eca7bd55dd76e8bbb236c0 SHA512 40ece85664a857902c7c9877d7690f685622e8dbff3b92742458fd5d9642e5ff1b1ef719a0157201cccf587d626658ec5c18f580b057cf46cd32ab560dbfe16c +EBUILD gsl-2.7.1-r2.ebuild 1376 BLAKE2B 614318a581ce8f61c3436a777b0b4398c5e889eaa7fa6b1b5fb55f08c5084bbd909b5bd4f77bac2cace810a3591238be174f0e65c180c0ed82cd1e3a7160bbaf SHA512 09c193524558297fb27c477213d9dcb9945f7682cbb6683212ebe39eca345dba24722262ab0d9aa965a4c6d505b30d8768d309e82d8cf9616a76e99985150439 MISC metadata.xml 1267 BLAKE2B e27fbdab6ce95b910bb5897c715888454a101019bd6606e636a1ebe8b6d03fd1379fc2f92f6009977855d3371e67ce9fca7fe54d017fdedeedfa4e15d07bac3e SHA512 9b49d1f1cca5608be7998e82eba8eb267cc055f711e8f867bc77725fbbb3fc313190f4012740110fac1d12de19bfbe8165fbd0d184ef3ade6964da45ba601300 diff --git a/sci-libs/gsl/files/gsl-2.7.1-configure-clang16.patch b/sci-libs/gsl/files/gsl-2.7.1-configure-clang16.patch new file mode 100644 index 000000000000..ba239563a38e --- /dev/null +++ b/sci-libs/gsl/files/gsl-2.7.1-configure-clang16.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/898410 +https://savannah.gnu.org/bugs/?63679 + +Avoid calling the undeclared exit function and future failures +with compilers which do not support implicit function declarations. + +--- a/configure.ac ++++ b/configure.ac +@@ -449,7 +449,7 @@ int main (void) + inf = exp(1.0e10); + nan = inf / inf ; + status = (nan == nan); +- exit (status); ++ return status; + }]])],[ac_cv_c_ieee_comparisons="yes"],[ac_cv_c_ieee_comparisons="no"],[ac_cv_c_ieee_comparisons="yes"]) + ]) + +@@ -469,7 +469,7 @@ int main (void) + for (i = 0; i < 5; i++) { z = z / 10.0 ; }; + for (i = 0; i < 5; i++) { z = z * 10.0 ; }; + status = (z == 0.0); +- exit (status); ++ return status; + }]])],[ac_cv_c_ieee_denormals="yes"],[ac_cv_c_ieee_denormals="no"],[ac_cv_c_ieee_denormals="yes"]) + ]) + diff --git a/sci-libs/gsl/gsl-2.7.1-r1.ebuild b/sci-libs/gsl/gsl-2.7.1-r1.ebuild deleted file mode 100644 index 64e427099641..000000000000 --- a/sci-libs/gsl/gsl-2.7.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic 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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7-cblas.patch.bz2" - -LICENSE="GPL-3+" -# Usually 0/${PV} but check -SLOT="0/27" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="cblas-external +deprecated static-libs" - -RDEPEND="cblas-external? ( virtual/cblas:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}"/${PN}-2.7-cblas.patch -) - -src_prepare() { - filter-flags -ffast-math - - default - - if use deprecated; then - sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die - fi - eautoreconf -} - -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_test() { - local MAKEOPTS="${MAKEOPTS} -j1" - default -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/gsl/gsl-2.7.1-r2.ebuild b/sci-libs/gsl/gsl-2.7.1-r2.ebuild new file mode 100644 index 000000000000..e65ec799e0d2 --- /dev/null +++ b/sci-libs/gsl/gsl-2.7.1-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic 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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7-cblas.patch.bz2" + +LICENSE="GPL-3+" +# Usually 0/${PV} but check +SLOT="0/27" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="cblas-external +deprecated static-libs" + +RDEPEND="cblas-external? ( virtual/cblas:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${WORKDIR}"/${PN}-2.7-cblas.patch + "${FILESDIR}"/${PN}-2.7.1-configure-clang16.patch +) + +src_prepare() { + default + + if use deprecated; then + sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die + fi + + eautoreconf +} + +src_configure() { + filter-flags -ffast-math + + 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_test() { + local MAKEOPTS="${MAKEOPTS} -j1" + default +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3