From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- sci-libs/taucs/Manifest | 5 +- sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch | 4 +- sci-libs/taucs/files/taucs-2.2-respect-ar.patch | 22 +++++++++ sci-libs/taucs/taucs-2.2.ebuild | 60 +++++++++++------------ 4 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 sci-libs/taucs/files/taucs-2.2-respect-ar.patch (limited to 'sci-libs/taucs') diff --git a/sci-libs/taucs/Manifest b/sci-libs/taucs/Manifest index 33e8a72a7191..8f3e0a392228 100644 --- a/sci-libs/taucs/Manifest +++ b/sci-libs/taucs/Manifest @@ -1,4 +1,5 @@ -AUX taucs-2.2-no-test-cilk.patch 816 BLAKE2B fec1076bbcbdfee1f474d585c32ff5aee477da7203fd35a853dbc7f96088c886f2832c35da99444e2abe2f7e8ea6612356eb5d92ed29cf76b7d4c1e254d2cdcd SHA512 04b580315d600eb68d908e10aaf5c600e03d7ec51437cf814dad6eed1eecd09e7b9c1d770e8c9c13e6ec268202c3335805dc32a68b9e5164cf038cd31acbcc95 +AUX taucs-2.2-no-test-cilk.patch 743 BLAKE2B f82a9949f18419aa9a763f5a388fe032fce636e685fab8e8b5b01ad44b594012f96d2b67ce597483303202125a3415ea95cce21de892e1347a7fb932fa71f563 SHA512 77a8d0a2a44267fc29319e80739042e0b0a9a289bbc50c5f429846fe0478890d32ac9a32444cc9f93a11ce6a7560297519d254b3b68d7cc993dce517dc3e4934 +AUX taucs-2.2-respect-ar.patch 635 BLAKE2B 59ea54427651adc597caf85bf5eafe8055a6223e3c588939519e660661ffec4082d574c08aebff8106508f4b5afe147d1f7ef5c1972b17461d286273c9cbb76a SHA512 b18551f3d386ebd203b422c9848bfb14c7d8bb67e0facb450869d0846ca23e35902339cfa519ef7b33d1cf0dfb6301bad5b9f2fcd2035d1e02b150a0c15a26e3 DIST taucs-2.2.tgz 1573863 BLAKE2B 21cf7479d7ce1f27678431e0d3dcaea1b3f8b11071b44651207791d6980bf5be0ed51cab7915f9e8da88d5da777c0f03a8d058e2ac8881e0d0b244ddfd796f5c SHA512 d8652de2da343dfd19c4278ac99313bcb577d976decdd3bd3875f0c9576832605b787feaef916eb4e82f22907c8bd029125c2ae56c827639e4d535ad62f20fcf -EBUILD taucs-2.2.ebuild 2351 BLAKE2B 72954250d55262a1592a4d379c112fd156e49ff6105ca0ab7699bbd586f47d992ac85208d7a173f584cf741a830c3d641e287ffb59e1eaaa6bb3549ea4f505b7 SHA512 eb276dd7eded2f3b4df30cfe8734ebb7f75013d6e759ec7a299890739a2dafdca98e82ee74b32f873c57540988ad55acb8a733e4dfc24d12d05e04b15089301b +EBUILD taucs-2.2.ebuild 2327 BLAKE2B 1a137803d8962e039d8a98ea0c22fdf205bc845d3736c9b9e2df6682d7eff4aee4428ccc8c1dc5c8cfa15fd4531c35a5cb265086037e4ee1bbe9938fa46c83be SHA512 1e7a63dcaf124d17f1aae3f142699bbb89fbf26cebf5a3d74edebf72b033c7a98f15880c2945e3d886aecb982f7d56eabdcb8f6a445605027719321962c8b6c0 MISC metadata.xml 1175 BLAKE2B fff1412619a6f94befc58004019c6c92cc142f0b286f59fc07d20b25868c90fae9cd67158b87c0cae78bee4b1b1320589339cbb259a036bac4419a9ec8e601f5 SHA512 8f768378475ce4364a51fbef44315a2c34cedf4db9aae4cbbebc5e487eb193693320ae56e3464b7a14f38adec41ef5e06d940890a5b55c1ef541acaf95b4e693 diff --git a/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch b/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch index 68ecc3bf94b6..332d1138dea0 100644 --- a/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch +++ b/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch @@ -1,5 +1,5 @@ ---- testscript.orig 2012-07-06 19:42:51.000000000 +0100 -+++ testscript 2012-07-06 19:43:17.000000000 +0100 +--- a/testscript ++++ b/testscript @@ -12,17 +12,6 @@ ulimit -s >> testscript.log echo '==============' >> testscript.log diff --git a/sci-libs/taucs/files/taucs-2.2-respect-ar.patch b/sci-libs/taucs/files/taucs-2.2-respect-ar.patch new file mode 100644 index 000000000000..4ab95441a2de --- /dev/null +++ b/sci-libs/taucs/files/taucs-2.2-respect-ar.patch @@ -0,0 +1,22 @@ +--- a/config/linux.mk ++++ b/config/linux.mk +@@ -25,7 +25,7 @@ + LDFLAGS = + LOUTFLG = $(COUTFLG) + +-AR = ar cr ++ARFLAGS = cr + AOUTFLG = + + RANLIB = ranlib +--- a/configurator/taucs_config.c ++++ b/configurator/taucs_config.c +@@ -558,7 +558,7 @@ + + fprintf(f, "%s: $(%s_content) $(STDDEPS)\n",get_full_name(i,0),base); + fprintf(f,"\t- $(RM) %s\n",get_full_name(i,0)); +- fprintf(f,"\t$(AR) $(AOUTFLG)%s $(%s_content)\n",get_full_name(i,0),base); ++ fprintf(f,"\t$(AR) $(ARFLAGS) $(AOUTFLG)%s $(%s_content)\n",get_full_name(i,0),base); + fprintf(f,"\t$(RANLIB) %s\n",get_full_name(i,0)); + } + diff --git a/sci-libs/taucs/taucs-2.2.ebuild b/sci-libs/taucs/taucs-2.2.ebuild index c3da7a074eb5..8ff8000be8dd 100644 --- a/sci-libs/taucs/taucs-2.2.ebuild +++ b/sci-libs/taucs/taucs-2.2.ebuild @@ -1,39 +1,47 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils fortran-2 toolchain-funcs +inherit fortran-2 toolchain-funcs DESCRIPTION="C library of sparse linear solvers" HOMEPAGE="http://www.tau.ac.il/~stoledo/taucs/" SRC_URI="http://www.tau.ac.il/~stoledo/${PN}/${PV}/${PN}.tgz -> ${P}.tgz" -SLOT="0" LICENSE="LGPL-2.1" -IUSE="cilk doc static-libs" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cilk doc" +RESTRICT="test" RDEPEND=" virtual/blas virtual/lapack - || ( sci-libs/metis sci-libs/parmetis ) + || ( + sci-libs/metis + sci-libs/parmetis + ) cilk? ( dev-lang/cilk )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}" -src_prepare() { +PATCHES=( # test with cilk has memory leaks - epatch "${FILESDIR}"/${P}-no-test-cilk.patch -} + "${FILESDIR}"/${P}-no-test-cilk.patch + # bug 725588 + "${FILESDIR}"/${P}-respect-ar.patch +) src_configure() { - cat > config/linux_shared.mk <<-EOF + cat > config/linux_shared.mk <<-EOF || die + AR=$(tc-getAR) FC=$(tc-getFC) CC=$(tc-getCC) LD=$(tc-getFC) + RANLIB=$(tc-getRANLIB) CFLAGS=${CFLAGS} -fPIC FFLAGS=${FFLAGS} -fPIC LDFLAGS=${LDFLAGS} -fPIC @@ -42,28 +50,22 @@ src_configure() { LIBF77= EOF - echo "LIBMETIS=$($(tc-getPKG_CONFIG) --libs metis)" >> config/linux_shared.mk + echo "LIBMETIS=$($(tc-getPKG_CONFIG) --libs metis)" >> config/linux_shared.mk || die # no cat <> config/linux_shared.mk - echo "CILKFLAGS=-O2 -I${EPREFIX}/usr/include/cilk -fPIC" >> config/linux_shared.mk - echo "CILKOUTFLG=-o " >> config/linux_shared.mk + echo "CILKC=cilkc" >> config/linux_shared.mk || die + echo "CILKFLAGS=-O2 -I${EPREFIX}/usr/include/cilk -fPIC" >> config/linux_shared.mk || die + echo "CILKOUTFLG=-o " >> config/linux_shared.mk || die fi - sed -e 's/ -fPIC//g' \ - config/linux_shared.mk \ - > config/linux_static.mk || die + sed -e 's/ -fPIC//g' config/linux_shared.mk || die } src_compile() { # not autotools configure - if use static-libs; then - ./configure variant=_static || die - emake - fi - ./configure variant=_shared || die + CC=$(tc-getCC) ./configure variant=_shared || die emake - cd lib/linux_shared + cd lib/linux_shared || die $(tc-getFC) ${LDFLAGS} -shared -Wl,-soname=libtaucs.so.1 \ -Wl,--whole-archive libtaucs.a -Wl,--no-whole-archive \ $($(tc-getPKG_CONFIG) --libs blas lapack metis) \ @@ -81,13 +83,11 @@ src_test() { } src_install() { - use static-libs && dolib.a lib/linux_static/libtaucs.a - ln -s libtaucs.so.1.0.0 lib/linux_shared/libtaucs.so.1 - ln -s libtaucs.so.1 lib/linux_shared/libtaucs.so + ln -s libtaucs.so.1.0.0 lib/linux_shared/libtaucs.so.1 || die + ln -s libtaucs.so.1 lib/linux_shared/libtaucs.so || die dolib.so lib/linux_shared/libtaucs.so* - insinto /usr/include - doins build/*/*.h src/*.h + doheader build/*/*.h src/*.h use doc && dodoc doc/*.pdf } -- cgit v1.2.3