diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-26 00:10:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-26 00:10:07 +0100 |
| commit | 95461df035e3867364495f065e5e805bf629b2d7 (patch) | |
| tree | 867dce371a84a696e91be255d89f282975aa0480 /sci-libs | |
| parent | 46eedbedafdb0040c37884982d4c775ce277fb7b (diff) | |
gentoo resync : 25.10.2021
Diffstat (limited to 'sci-libs')
37 files changed, 665 insertions, 690 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex fd7d8d4658f7..7cffbf494472 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest index 94099ef4c73c..4bbe30d33a58 100644 --- a/sci-libs/adolc/Manifest +++ b/sci-libs/adolc/Manifest @@ -1,5 +1,5 @@ DIST adolc-2.7.2-patches.tar.bz2 6227 BLAKE2B 6ed9ca3c3128233308b6f4a57d839ac668a031a4d48e612b79929541b496dff67e463197c3c5233bda459fba17422827df6c81fba986ea7fe2affbee2cb8cbf0 SHA512 b468753efbde773c5c7d7f0211abee049193d9b64405ae57a4a902a93a4c06e4f205f531aeee9f30d7dddef19243e1a76b77a8e8727d8e36ee3867f5990e2fbb DIST adolc-2.7.2.tar.gz 2447479 BLAKE2B 0f871ce1dcb50bb14684e45e265cf45807f514dd3ca0dbaaedede2c7117d34cc5a34b0096a34c8ec37023e50aec7fd4be6561819d6297771e7f7fcaa7ba0e507 SHA512 b896650077367fd7388a6c5a40e5d8bb3f19af9e3bc5b067fd1d9a769809b77ccdfb5ef11ef481ab791c0f040401aaed0053cba55d4c2a3383c0d056122280f6 -EBUILD adolc-2.7.2.ebuild 1797 BLAKE2B 7e255e9eb6e945589b93cce211d9cd7decf193fa20ce38884b76fd82185bf0106a30055b16e8d613e8f5df0f5d5741cc50784191bd02c83dab0a13149a7234d8 SHA512 df2efade5957602f19e770ea1dee3382b6df6ac14d3fa9271bb3ca3772cb4251c18c7e8dd838abcd9870511090ec82602da1229a876fe6b4bff1b903eb6b6b01 +EBUILD adolc-2.7.2.ebuild 1796 BLAKE2B a063021049460e99836a9429c24e3084d45b8ddb238c55b517d078e850200858e50b7a626251c5ab0c02926170b00b88ad05faf8a482578ee1f172074d65d2b7 SHA512 6cbc132dddf6d1768314077717bdd8dcbdd54b331b5c7c589e6818f924619351ec8e8047708aafb26019a453530ed41f7dbdd5417f3fdace797f1cb66b166947 EBUILD adolc-9999.ebuild 1625 BLAKE2B 41ae54bbfb6934c626b15bdfba17604c8f705ad64f078a9e084050fe5e314b0135b640871f6f50ccefabd740077a2458d869a45c084ec5e5855aed1d41b328f8 SHA512 b2c55ed1919d6dae5deca1f5db84e72bfd2c12a8d42583923d50e86bb421e29b805fd889814975134fcb2e5ba0f0ca7377b6ba68300c207702eca9242e9dbb7b MISC metadata.xml 737 BLAKE2B 92ed3294a4511473f081d3cf957a0b8538faec13cea3163985387ddc040defff8b908994572aefbd388313454c469388d10a5524c051a548ac001ee402a1a4b8 SHA512 8736523790d05b594a27b4bb679653f3a807de9442754c998a5ce3f0abee0cc4c94e1f31a1a639d9079c7a2574c2440f4e735efa271629bb0f83ac09eacf94b0 diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild index ae757ddcbcb5..3a94424b3115 100644 --- a/sci-libs/adolc/adolc-2.7.2.ebuild +++ b/sci-libs/adolc/adolc-2.7.2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/ADOL-C-releases-${PV}" fi diff --git a/sci-libs/cgcode/Manifest b/sci-libs/cgcode/Manifest index 9e2b33d58032..124671daf4a3 100644 --- a/sci-libs/cgcode/Manifest +++ b/sci-libs/cgcode/Manifest @@ -1,4 +1,4 @@ -AUX 1.0-gentoo.patch 2363 BLAKE2B 80c0ea8dce38494c2b21fc79ff9f7e8121e4d529015a496d9af7acb87f0a50e39e0338af6884d7e662005d064fa9ca8e0893ed45e746cc44b3b2730f47750917 SHA512 2daaf89d275a325404ec6804389a45fe02361e4e517a146dd329b9155a2200b4151bb559f4aad87055ed5d6da4227e0a30683ba82cfa1bb5f54c6cc40a76aea7 +AUX 1.0-gentoo.patch 2156 BLAKE2B f4ee517b96feb5ff5e69a97e4508751622edcc2a187283f53c5a0c0e25aed46799d6bcccbcad9d26a709aa76746bf9912224c2bb11550375bba238c565db0194 SHA512 70dbefb641750142c71d8c1d4b0b85740af8a1bcf2dd9c39db3aa7cbf99bc163352832c445e6bfc674c37919da8e91b952dd6fe257742b297c96ac59b52da6ab DIST cgcode-1.0.tar.gz 77941 BLAKE2B bb062991d4bca842225b357a4bfd24edd2293ace224de141dc5782da82b3fb357d79cc8e06d90b948a8016fd726559469ab032b87cd8a678f10188079804295c SHA512 df76a2f8a0c00924af3d6933487a363fe23ded8281b392d40f240074c8643219f99dda9b6b6d515a281827d657a27ab06416ce152e65c5fead7549bb96be9621 -EBUILD cgcode-1.0-r2.ebuild 878 BLAKE2B 5663e71c2d081c75d57efeb7cb0c2e4692407bd44af77623f3e12ac905ac17c6ab4b7744059ffe16d2a77b7a9e668a8a11f9663e5a968787096908ce6f0e4f14 SHA512 02d27d15f596a1360086edff5dc8639da8390b8922b35f0bd47e3f9a5791d27afc895f3850c0934b3306a41a5a54279e65001cda15bd6f111b464bca6944b6db +EBUILD cgcode-1.0-r2.ebuild 893 BLAKE2B 471caf9e01a5d0480f4cb6faaad522efb0ac0c492c2ceddbac3b96256ed39f69a5aa2cb5aa84a4a0f6797ccb4e8e1aa4321ec3f7213fdddcb6765f0eef577e3f SHA512 015ebaa8eefdfc325293edd94a2595f319e35ab9cea34e856b966a3700af3f7b07d4455521cdb0bb09d2aa03727f2128eab1c92cbe667b27e72bfc803c8d52b0 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045 diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild index dbb7d0622da8..6fe1ddee3b21 100644 --- a/sci-libs/cgcode/cgcode-1.0-r2.ebuild +++ b/sci-libs/cgcode/cgcode-1.0-r2.ebuild @@ -1,33 +1,35 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit epatch fortran-2 flag-o-matic toolchain-funcs +inherit fortran-2 flag-o-matic toolchain-funcs DESCRIPTION="Conjugate gradient Codes for large sparse linear systems" HOMEPAGE="http://fetk.org/codes/cgcode/index.html" SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz" +S="${WORKDIR}"/${PN} +LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2" -IUSE="" RDEPEND="virtual/blas" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}"/${PN} +PATCHES=( + "${FILESDIR}"/${PV}-gentoo.patch +) src_prepare() { - epatch "${FILESDIR}"/${PV}-gentoo.patch + default # GCC 10 workaround # bug #722000 append-fflags $(test-flags-FC -fallow-argument-mismatch) - cat >> make.inc <<- EOF + cat >> make.inc <<- EOF || die F77 = $(tc-getFC) FFLAGS = ${FFLAGS} BLASLIBS = $($(tc-getPKG_CONFIG) --libs blas) diff --git a/sci-libs/cgcode/files/1.0-gentoo.patch b/sci-libs/cgcode/files/1.0-gentoo.patch index 612ca9e06497..449f1f18dde5 100644 --- a/sci-libs/cgcode/files/1.0-gentoo.patch +++ b/sci-libs/cgcode/files/1.0-gentoo.patch @@ -1,5 +1,3 @@ -diff --git a/makefile b/makefile -index 4813b55..f20af02 100644 --- a/makefile +++ b/makefile @@ -1,21 +1,23 @@ @@ -33,8 +31,6 @@ index 4813b55..f20af02 100644 clean : rm -f *.o goos good -diff --git a/src/makefile b/src/makefile -index 10cf6c3..1dfd02d 100644 --- a/src/makefile +++ b/src/makefile @@ -1,16 +1,17 @@ @@ -60,8 +56,6 @@ index 10cf6c3..1dfd02d 100644 clean : rm -f *.o $(THISLIB) -diff --git a/util/makefile b/util/makefile -index 6dad0d1..5c9d24f 100644 --- a/util/makefile +++ b/util/makefile @@ -6,11 +6,12 @@ SOBJLIB = saxpy.o scopy.o sdot.o snrm2.o sscal.o diff --git a/sci-libs/clashscore-db/Manifest b/sci-libs/clashscore-db/Manifest index 33e450add56d..a8472f093dd4 100644 --- a/sci-libs/clashscore-db/Manifest +++ b/sci-libs/clashscore-db/Manifest @@ -1,3 +1,3 @@ DIST molprobity-3.17.tgz 26429898 BLAKE2B f2ed8f71c4f71c19aac6278eed40cba0db53e88dc1be7ccb6e3e831d4202456822efe93ded2cc8ca3226efb9ef10999895b191e8b5d5188d577b78c9fa5a8c66 SHA512 a6e986f285ff7e8d167e2d1c935a55b080446c9809d352c95e2ffa32265892b59cd1611730e75ca88aa28387495d3ebd84226e1a9cdd33f0b27b1a8a1b6a469f -EBUILD clashscore-db-3.17.ebuild 469 BLAKE2B b940d88488f89dcf9113257307fa1bb43630da8b4678708856a5923e475a80993ff2ddfbbe98d5c0d186d33b6c66a5a565194a300f63568b17ab709f4f7523cc SHA512 ae1407f0c51e0197bab1971ec8abb23ff5b99c300be8d8e30848748e72ed62051f9d3970bd1ffea3de6dd016aedd3c3d850d93de1ffabd960a436bd680c8ada5 +EBUILD clashscore-db-3.17-r1.ebuild 457 BLAKE2B 5e287990f37f03573196aa1779270910680c0219516de7b62d0a20eb24af2d7a5273720cece7c6fc0e1ad76310d429b7f8c6474748d1d31a665583afa9e27794 SHA512 9776f51bf83729928f07a73a60221102fb5a5961785408177976a86e1f51a91d0e5113d56a3dda0b8fad425c8b49a7ce1165c6ff07c2d9f5b35b3928f9d78dd0 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c diff --git a/sci-libs/clashscore-db/clashscore-db-3.17.ebuild b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild index bad0582b7168..41bea4a55af2 100644 --- a/sci-libs/clashscore-db/clashscore-db-3.17.ebuild +++ b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild @@ -1,21 +1,19 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="Clashscore-db for clashlist" HOMEPAGE="http://kinemage.biochem.duke.edu/" SRC_URI="mirror://gentoo/molprobity-${PV}.tgz" +S="${WORKDIR}" -SLOT="0" LICENSE="richardson" +SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" RESTRICT="binchecks strip" -S="${WORKDIR}" - src_install() { insinto /usr/share/clashscore doins molprobity3/lib/clashscore.db.tab diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest index 8eed4f21e358..5bc680085d01 100644 --- a/sci-libs/colpack/Manifest +++ b/sci-libs/colpack/Manifest @@ -1,3 +1,3 @@ DIST colpack-1.0.10.tar.gz 658087 BLAKE2B af6409969f0dfee465ad88515d0d4f82525047a8268ac9fd4b0784de1f4fd30ce7ba968502a5d92ad3a86f554fb8f1a786defb09396c8e678f62aeaa3cc25397 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808 -EBUILD colpack-1.0.10.ebuild 965 BLAKE2B 7dfc6414b537ac1bfe14f6d9dd581f7b5cc76e8a55a7f40eae349aebda5ec442bf2b6b3c29635ac8714c77c74528e2cd3009c66d2a4f92caab0cc44cadb6300f SHA512 a2aecae4c439ed7a9aa758760c55b4448616afb44f80f8b2d129db8b6abeb61035e111dfd9d18fcbb7ac304a80cca1c05bced0c2821f96703894817dc947b0f7 +EBUILD colpack-1.0.10.ebuild 964 BLAKE2B 7eb95ce55b514534abef11dd91cbfc16fda336107dd398d9c802a75c67c5ea90e2356a78a498f21d162c04d0a9eab2ea9536b49a954111e062404d8fdcb06e24 SHA512 9a03e742d5b765f68d3d0b05867d15a24ba4d8949419cb0e0c33437bedb0134348272acbfec8406ef8cf3cc9ca65e9ca9bf09370fd25c1d79366401205fc5d8e MISC metadata.xml 606 BLAKE2B 6d62ec670ced7058bee94be97ad61fd6e12b6e51e76e1e2e35e8e0928958bb9c77f0d99c3d881b0e63bc4e55a677888813ff7f277da39d891aed8cdb37a8be24 SHA512 cddb0eddbbdbc91ee7e2c39911cdebe572fdf2985131fa0e8dc5705f1722747283b0bcef141e57559a9ad0f5f9629a8bdb76644900bab3d025ee5ca3867549b2 diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild index 5bcd1dd7c0ef..91abe0eccbeb 100644 --- a/sci-libs/colpack/colpack-1.0.10.ebuild +++ b/sci-libs/colpack/colpack-1.0.10.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="openmp" S="${WORKDIR}/${MYPN}-${PV}" diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index b8ea8affb1e4..0bacc576ffde 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,6 +1,8 @@ +DIST geos-3.10.0.tar.bz2 6799370 BLAKE2B dd1490318fccda8ccaf5152f8521ab98ef5e4b143e12e861d02124421985a8b2c966bca6f966aa167fb60f703d25c132b8c7ee4d61e382a449bce5eb40d4cb89 SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056 DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8 DIST geos-3.9.1-r1.tar.bz2 4761372 BLAKE2B af1597d9372b18a2f280d82941949518cd8edb9296e9647aa3949c9e10fdd1b6ef500298471ec469d711ab0569eabd8fc3fb0a8f7e9bd48f91150cfdcaea65a8 SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28 +EBUILD geos-3.10.0.ebuild 893 BLAKE2B 8521c67729471eeb9c0107f5ede61c36395ab976e9523f0f2b7add37b7aaf4d28d6535a09d3f86e98ec82d3381e8e352c68d37efef9004f5aea1908acf32e67f SHA512 07de91bb433290d77299758ad62f18bc656f371612dc6ed85854e2133ec19571203e4e40ce789cad25cba210b0a6409eef8b1d783e05bd4703a7baa0ec0bb5c0 EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe EBUILD geos-3.9.0-r2.ebuild 1073 BLAKE2B dfddcb6c942568397a90094ae3d16a91758fe9610bb8310e0f53d9c33780e163f9f4dcedd1c6739d48c286eaa3534e1bc563b9a4450fb0e65d5cd923acc8ae1f SHA512 89667cccb1b67be07c423813c404e22762c319a8b1e777d1d15a9ae0b6753f499967324c454165f730602288d97822ce6bdd6b3fda6b8077866e88ad6bdca0fc EBUILD geos-3.9.1.ebuild 1080 BLAKE2B 48c77ba041160de43d2205a14ad00f7f60d648350e989985ff5b22e0f3634c863ce15b7a631689ba3267c93030705f8216d09c04574d486ebbf14c7f638ba130 SHA512 de0981ff9381b5fca93fa304fe7c16ea02491878ce6e34a7642412d028c34c10315c346ba6c7fbea572f2d3338e52278c7a318746aff55c1435dbb4fa49239b9 diff --git a/sci-libs/geos/geos-3.10.0.ebuild b/sci-libs/geos/geos-3.10.0.ebuild new file mode 100644 index 000000000000..28033433e149 --- /dev/null +++ b/sci-libs/geos/geos-3.10.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Geometry engine library for Geographic Information Systems" +HOMEPAGE="https://trac.osgeo.org/geos/" +SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +IUSE="doc" + +BDEPEND="doc? ( app-doc/doxygen )" + +src_configure() { + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc) + + # bug #709368 + $(usex arm '-DDISABLE_GEOS_INLINE=ON' '') + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_src_compile docs +} + +src_install() { + cmake_src_install + + if use doc ; then + HTML_DOCS=( "${BUILD_DIR}"/doc/doxygen_docs/html/. ) + einstalldocs + fi +} diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index 0c1326ee401c..eba4f5de3f55 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -1,12 +1,4 @@ -AUX cblas.pc.in 290 BLAKE2B c967d31982888ca2c180be0fc0691586e3fdbe2527fb54995cd5c85113ec6af8695c69ef9c70fc89ac271b818fb4ec5e53c010ea7e54a3e85712f1f51b9cf423 SHA512 2a1dc22097e2a50fd4a797c446b32202b74e9d754c8b61c51a3789c3eb42372adcc7fb25901c468d604cc4e7961d7f11e0e5883179894047948e46879fc04719 -AUX eselect.cblas.gsl 216 BLAKE2B d1f8be34cac7b83d88f69a3fd382fc68c96a04fc39b1e28ebe93b1a86ab5552cc7e6c559167151927ccddc3d8c1a27de30bc4f1aec96a84d8099d86d78bbb3ad SHA512 e5cd92f4e9829538642a0fed54fdf75bc579c8c20769997ec5a3ce0287993476e68fbeefec8e46162d05ea908d2e79187c15ebdd00f6558ecbd25de21ece64dc -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 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 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 -EBUILD gsl-1.16.ebuild 3069 BLAKE2B 3cb68ede8761db13a1e17b0e0aff1f165e20f38946dd5b70a92b597c38faa4581bd0c9b96d16257f7fbccfa765513e4a0319686f4ffd959e7a0d2e084cacab75 SHA512 03a6b20f6d6cf125d120841aea9b2170e9bb77bbc64346e82f3a03fc5e78c19ae75bf8e01c19e6371f21658c3bcc168f0f13a04ebb500715629c45306b5af713 -EBUILD gsl-2.5-r1.ebuild 1428 BLAKE2B 199410861db77b4e73bba3647790efd91fe675185c55cb1730e6e06221753f34048cff8033e07c1846104801c994da0b9fe0c2da3a6661e3899d67b0345892fc SHA512 bc175e93a0ab179b397d97efe24a9b66a1787c28dcd5c38e6cec359246790fb01fb43764567dd1031ace02acc99928d1518a59f6c4e98b8c674c7f8f1f7c09bf -EBUILD gsl-2.7.ebuild 1458 BLAKE2B 5eb807b11c79db186302341a8877ba9e35b9d144e26ea2087340fac45dc6131382bb4c0e67d219926ff2550714edeefc718e4818411a80ebbe3c691f2a1ce39b SHA512 c77d9bda24cafc6c9bd612c5d5727ac2e2ef2df30d6718cdcadfa6c63f5a04428ff586224c81a632a35eee1aba86c7dbe2210ecd733ef7bc68c78046635cd3fe +EBUILD gsl-2.7.ebuild 1456 BLAKE2B b5fb1ef6587526b39804ce175d0f67a7917a0f48a90ff3585577b51ba7547b026e3518801fb66f43cff5c8228142189e65cfe5e1bf0ef7cdb3c166b9532b5231 SHA512 14e1f9ee0d3d7b3e9942082b143971426352011c27ff4cfdeb9e63294c68598e38b2ff8074f4431909b1d06603b8120288a4504981732c6e8beb2fb0e597dcf3 MISC metadata.xml 1191 BLAKE2B 856a9a1b3195a76a6c1fffe65dbb94b90a135ce4290c33d772efca43be04f29db7efee5083ee997660c5831aa75773993423645a28e82072b3ceb877135d6810 SHA512 9cb110e5202df7ca123da18ffd0ac60d1d9d5577a29dacff001b24b0c0eae4f96851273d72956dd7b0b94c9fabd392ea13ae6aae54e801d118032d215ede59b2 diff --git a/sci-libs/gsl/files/cblas.pc.in b/sci-libs/gsl/files/cblas.pc.in deleted file mode 100644 index a2580f85e6e8..000000000000 --- 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 af6fee51fef9..000000000000 --- 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 eac9c3b6f75d..000000000000 --- 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 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 "${WORKDIR}"/${P}-cblas.patch - eautoreconf - - cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ || die - 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_test() { - emake -j1 check -} - -src_install() { - default - - find "${ED}" -name '*.la' -exec rm -f {} + || die - - # 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 - 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 -} diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild deleted file mode 100644 index f9cbafbd975d..000000000000 --- a/sci-libs/gsl/gsl-2.5-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 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/~mgorny/dist/${PN}-2.3-cblas.patch.bz2" - -LICENSE="GPL-3" -SLOT="0/23" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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.3-cblas.patch ) - -src_prepare() { - # bug 349005 - [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(tc-getCC)$ != *apple* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \ - && filter-mfpmath sse - 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' -exec rm -f {} + -} diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild index 7fe267577885..1f76267c23d5 100644 --- a/sci-libs/gsl/gsl-2.7.ebuild +++ b/sci-libs/gsl/gsl-2.7.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz LICENSE="GPL-3" SLOT="0/25" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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:= )" diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest index d23a3cfb22d4..5a426568d667 100644 --- a/sci-libs/lrslib/Manifest +++ b/sci-libs/lrslib/Manifest @@ -1,5 +1,10 @@ +AUX lrslib-071b-makefile-cflags.patch 7312 BLAKE2B 1866059b3dfe59221f9448a9025186fce190a547b2ba5c01fc872e8ea4cac497c21c7bcc3dfceea70df7ae7b7d39dec6115e1945b497f9987ef2baa4783bad75 SHA512 460cd8ac278e02c2580581ecfc79d208b18fda77b55a4709076b31579a4533810d5d157c96c96375ed021c373d67d7bd0e3cad3758e0d09d47c3e239b479a888 +AUX lrslib-071b-makefile-ldflags.patch 11708 BLAKE2B 669a6194a3c7ae966bfa0660671a59fa16be6dc5770e0743a27274a6bd2e42f7bd5caa59476ab4bb9d128f2f48ad7d704cd85301f0507235d7f1d711f257f9f1 SHA512 c863e8c30df9b2cd608453430c6a484c94cbd9200ada9161c9a2a8e7994ffaffad125b874318ebd74b4c66e57347f7687db85b461abc75f47b7ebba8b0db2537 DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f DIST lrslib-071.tar.gz 460165 BLAKE2B 67be1ffac1c09a94773c69fc2215db19623bc8bc78be74342a1eda497b70eed2d8cb8e9b34ce269177154a4aed6f7bde02f632a536999b24f3116b3e69be456e SHA512 451aa5dada106516aeed1688c1e939a2e216ac760addb483f9cc1d5d4ac62e88af2772a6fa589b217b544621d041d94386a79502483db2eeaf04e90c4a3fd78e +DIST lrslib-071b.tar.gz 466789 BLAKE2B 57a8abd9d203b1cdc62d6848afa77aa6912d9d720a0dedfbe72ca602ad8ba36d13160f7da7d719e3fa140ba2cb6432d20590ae9ea9b1f66bc2e24c393d9fe1bd SHA512 feafc5726e66c977e917f0b59ae950cdb98dbd84639885b487930aab2a89a7f067a3f39c381acc3eae7206b91255e1befa5551488d8816afc0f8054d801eb539 EBUILD lrslib-062.ebuild 1102 BLAKE2B 28715334971ebcdf529cb1454259b91fe7b4f08f5adfbb6a69e7f26e77b3a75409e59c3bdad04ec3401eaccee1d058d18c7923d50f2c10ebf954b11400316266 SHA512 fbbe152ec18650aa38811ee467f04e1698baf8e5070258c7d69e2b80a543164ed24ef85f6a22b790c12f8782e56b11371e470637d12f771301c050bb9516b27f EBUILD lrslib-071.ebuild 1039 BLAKE2B 4a94c591406d9e4eb5f64476327e09baf8653434bd836b8c95592c6179399d8231f3ecabb0b342e6770fecf886ef20f3bb534b0fa79501fe34a4f6e5b5749727 SHA512 c904206d02dac52865e156d08871e21b4f7cd91aef7e1d21aa7b76ec1cad4d34e06798b4d2983566e1e0acc5db9e2fe0fd29f6de535e7b29af9d211efb88458b +EBUILD lrslib-071b-r1.ebuild 1349 BLAKE2B 41f7bc2fb58761ab49d6ab888142e9272b16ff3dbe291f2ed64dcb0bef1514e967706b080b559eea4ebc322716048346fbebae5d1cce8a960f39373d26187e5b SHA512 1b93a3e7b399519d1ccc30e141002e5c9049dd509cbe489558063dfee40925aa76457c63e7a40943897d2685657949edb0c15a68a619a65c74acc52e42237584 +EBUILD lrslib-071b.ebuild 1328 BLAKE2B 2583df67a90104c442f382c1a7b3baab92ad7294dd36552fb1fc0fc7c5eee575a1f3d221faf8efea8c6ff35efb7495ae7b72d56aafe1f8821758b2ebe62a61d8 SHA512 f0cf668e6181fcab7887afd6bdfd7757bb2d6dba4c94c980bf132128b070ecdf9aa12e2d1342bd8baf66040e5ff0ef8a18ac9e2999335ec7530e3397b8aed194 MISC metadata.xml 770 BLAKE2B 79a7016f0c9de246e2873db9026c26f360432b238fd8d380d75830ae7560d56743981f053fef60a2516befef7d9aa6947cb0a3cdb9de077bd6a65a8faa4879d7 SHA512 007d258279f5d48fdc108176f4230958c683cbfaca08a9f16c194b5bccd3d622a6049e7aea0ee7fec65643a0959f948371d0b228501acf9ebbe58ecabf904171 diff --git a/sci-libs/lrslib/files/lrslib-071b-makefile-cflags.patch b/sci-libs/lrslib/files/lrslib-071b-makefile-cflags.patch new file mode 100644 index 000000000000..1cc8303f616a --- /dev/null +++ b/sci-libs/lrslib/files/lrslib-071b-makefile-cflags.patch @@ -0,0 +1,100 @@ +From 8a99af08a479c413d54c1a8def7479c778e55703 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 23 Oct 2021 07:53:22 -0400 +Subject: [PATCH 2/2] makefile: replace remaining "-O3" with $(CFLAGS). + +Some time in the past, $CFLAGS was inserted into most of the build +rules, and defaulted to "-O3 -Wall" if the user does not override +that. However a few lingering "-O3" and "-O3 -Wall" remain hard- +coded in the makefile. Here we fix that. +--- + makefile | 48 ++++++++++++++++++++++++------------------------ + 1 file changed, 24 insertions(+), 24 deletions(-) + +diff --git a/makefile b/makefile +index fd8a613..c14b93e 100644 +--- a/makefile ++++ b/makefile +@@ -64,12 +64,12 @@ MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o lrs + + lrs: ${LRSOBJ} + $(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} $(LDFLAGS) -o lrs ${LRSOBJ} -lgmp +- $(CC) -O3 hvref.c $(LDFLAGS) -o hvref ++ $(CC) $(CFLAGS) hvref.c $(LDFLAGS) -o hvref + ln -s -f lrs redund + + lrsmp: ${LRSOBJMP} + $(CC) ${CFLAGS} -DMA ${BITS} $(LDFLAGS) -o lrsmp ${LRSOBJMP} +- $(CC) -O3 hvref.c $(LDFLAGS) -o hvref ++ $(CC) $(CFLAGS) hvref.c $(LDFLAGS) -o hvref + ln -s -f lrs redund + + lrs64: ${LRSOBJ64} +@@ -157,8 +157,8 @@ singlemplrs: mplrsgmp mplrs1 mplrs2 + + flint: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h + @test -d ${INCLUDEDIR}/flint || { echo ${INCLUDEDIR}/flint not found; exit 1; } +- $(CC) -O3 -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint $(LDFLAGS) -o lrsflint -lgmp +-# $(CC) -O3 -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o lrsflint -lgmp ++ $(CC) $(CFLAGS) -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint $(LDFLAGS) -o lrsflint -lgmp ++# $(CC) $(CFLAGS) -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o lrsflint -lgmp + + mplrsflint: mplrs.c mplrs.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.c lrsdriver.h + ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DPLRS $(LDFLAGS) -o mplrsflint mplrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp +@@ -176,33 +176,33 @@ single: lrs.c lrslong.c lrslong.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver + ln -s -f lrs2 redund2 + + allmp: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c +- $(CC) -Wall -O3 $(LDFLAGS) -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c +- $(CC) -Wall -O3 -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c +- $(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c +- $(CC) -O3 -DLRS_QUIET $(LDFLAGS) -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static +- $(CC) -O3 $(LDFLAGS) -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c +- $(CC) -O3 $(LDFLAGS) -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c +- $(CC) -O3 $(LDFLAGS) -o 2nash 2nash.c ++ $(CC) -Wall $(CFLAGS) $(LDFLAGS) -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c ++ $(CC) -Wall $(CFLAGS) -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c ++ $(CC) -Wall $(CFLAGS) -DSAFE -DLRSLONG ${BITS} $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c ++ $(CC) $(CFLAGS) -DLRS_QUIET $(LDFLAGS) -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static ++ $(CC) $(CFLAGS) $(LDFLAGS) -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o 2nash 2nash.c + + demo: lpdemo1.c lrslib.c lrsdriver.c lrslib.h lrsgmp.c lrsgmp.h +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo lpdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o vedemo vedemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o chdemo chdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo lpdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o vedemo vedemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o chdemo chdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP + + lrsnash: lrsnash.c nashdemo.c lrsnashlib.c lrslib.c lrsnashlib.h lrslib.h lrsgmp.c lrsgmp.h lrslong.h lrsdriver.h lrsdriver.c +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS} +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o 2nash 2nash.c ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS} ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o 2nash 2nash.c + cp lrsnashgmp lrsnash + + fel: fel.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c lrslong.c +- $(CC) -O3 -Wall -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp $(LDFLAGS) -o felgmp +- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE $(LDFLAGS) -o fel1 +- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} $(LDFLAGS) -o fel2 ++ $(CC) $(CFLAGS) -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp $(LDFLAGS) -o felgmp ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE $(LDFLAGS) -o fel1 ++ $(CC) $(CFLAGS) -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} $(LDFLAGS) -o fel2 + + ###################################################################### + # From here on the author is David Bremner <bremner@unb.ca> to whom you should turn for help +-- +2.32.0 + diff --git a/sci-libs/lrslib/files/lrslib-071b-makefile-ldflags.patch b/sci-libs/lrslib/files/lrslib-071b-makefile-ldflags.patch new file mode 100644 index 000000000000..c8c9bc1e8206 --- /dev/null +++ b/sci-libs/lrslib/files/lrslib-071b-makefile-ldflags.patch @@ -0,0 +1,184 @@ +From f9a97514196eb35de1cdae1c1fc622c8aff5fb04 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 23 Oct 2021 07:37:57 -0400 +Subject: [PATCH 1/2] makefile: add $(LDFLAGS) to commands that induce linkage. + +Like the more-familiar CFLAGS, there is a standard variable called +LDFLAGS that should be used while linking libraries and executables. +The default compilation rules for POSIX make include it, + + https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html + +This commit adds LDFLAGS to the custom makefile commands that link +either an executable or a shared library. +--- + makefile | 80 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 40 insertions(+), 40 deletions(-) + +diff --git a/makefile b/makefile +index 32e6b52..fd8a613 100644 +--- a/makefile ++++ b/makefile +@@ -63,17 +63,17 @@ LRSOBJ64=lrs64.o lrslong1.o lrslib1.o lrslibgmp.o lrsgmp.o lrsdriver.o + MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o lrsdriver-mplrs.o mplrs64.o + + lrs: ${LRSOBJ} +- $(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp +- $(CC) -O3 hvref.c -o hvref ++ $(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} $(LDFLAGS) -o lrs ${LRSOBJ} -lgmp ++ $(CC) -O3 hvref.c $(LDFLAGS) -o hvref + ln -s -f lrs redund + + lrsmp: ${LRSOBJMP} +- $(CC) ${CFLAGS} -DMA ${BITS} -o lrsmp ${LRSOBJMP} +- $(CC) -O3 hvref.c -o hvref ++ $(CC) ${CFLAGS} -DMA ${BITS} $(LDFLAGS) -o lrsmp ${LRSOBJMP} ++ $(CC) -O3 hvref.c $(LDFLAGS) -o hvref + ln -s -f lrs redund + + lrs64: ${LRSOBJ64} +- $(CC) ${CFLAGS} -DMA -L${LIBDIR} -o lrs ${LRSOBJ64} -lgmp ++ $(CC) ${CFLAGS} -DMA -L${LIBDIR} $(LDFLAGS) -o lrs ${LRSOBJ64} -lgmp + + lrs.o: lrs.c + $(CC) ${CFLAGS} -DMA ${BITS} -c -o lrs.o lrs.c +@@ -106,7 +106,7 @@ lrsmp.o: lrsmp.c lrsmp.h + $(CC) ${CFLAGS} -DMA -DMP -c -o lrsmp.o lrsmp.c + + checkpred: checkpred.c lrsgmp.h lrsgmp.c +- $(CC) $(CFLAGS) -DGMP -lgmp -o checkpred checkpred.c lrsgmp.c ++ $(CC) $(CFLAGS) -DGMP -lgmp $(LDFLAGS) -o checkpred checkpred.c lrsgmp.c + + lrslong1-mplrs.o: lrslong.c lrslong.h + $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE -DLRSLONG -DPLRS -c -o lrslong1-mplrs.o lrslong.c +@@ -136,73 +136,73 @@ mplrs64.o: mplrs.c mplrs.h lrslib.h lrsgmp.h + $(mpicxx) ${CFLAGS} -I${INCLUDEDIR} -DMA -DPLRS -DTIMES -DSIGNALS -D_WITH_GETLINE -c -o mplrs64.o mplrs.c + + mplrs: ${MPLRSOBJ} mplrsgmp +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA ${BITS} -L${LIBDIR} -o mplrs ${MPLRSOBJ} -lgmp ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA ${BITS} -L${LIBDIR} $(LDFLAGS) -o mplrs ${MPLRSOBJ} -lgmp + + mplrs64: ${MPLRSOBJ64} mplrsgmp +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA -L${LIBDIR} -o mplrs ${MPLRSOBJ64} -lgmp ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA -L${LIBDIR} $(LDFLAGS) -o mplrs ${MPLRSOBJ64} -lgmp + + mplrsgmp: mplrs.c mplrs.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DGMP -I${INCLUDEDIR} mplrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -o mplrsgmp -lgmp ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DGMP -I${INCLUDEDIR} mplrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} $(LDFLAGS) -o mplrsgmp -lgmp + + mplrs1: mplrs.c mplrs.h lrslib.c lrslib.h lrslong.c lrslong.h lrsdriver.h lrsdriver.c +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DLRSLONG mplrs.c lrslib.c lrslong.c lrsdriver.c -o mplrs1 ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DLRSLONG mplrs.c lrslib.c lrslong.c lrsdriver.c $(LDFLAGS) -o mplrs1 + + mplrs2: mplrs.c mplrs.h lrslib.c lrslib.h lrslong.c lrslong.h lrsdriver.h lrsdriver.c +- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DSAFE -DLRSLONG ${BITS} mplrs.c lrslib.c lrslong.c lrsdriver.c -o mplrs2 ++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DSAFE -DLRSLONG ${BITS} mplrs.c lrslib.c lrslong.c lrsdriver.c $(LDFLAGS) -o mplrs2 + + mplrsmp: mplrs.c mplrs.h lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c +- $(mpicxx) ${CFLAGS} -DMP -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS mplrs.c lrslib.c lrsmp.c lrsdriver.c -o mplrsmp ++ $(mpicxx) ${CFLAGS} -DMP -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS mplrs.c lrslib.c lrsmp.c lrsdriver.c $(LDFLAGS) -o mplrsmp + + singlemplrs: mplrsgmp mplrs1 mplrs2 + + flint: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h + @test -d ${INCLUDEDIR}/flint || { echo ${INCLUDEDIR}/flint not found; exit 1; } +- $(CC) -O3 -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint -o lrsflint -lgmp ++ $(CC) -O3 -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint $(LDFLAGS) -o lrsflint -lgmp + # $(CC) -O3 -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o lrsflint -lgmp + + mplrsflint: mplrs.c mplrs.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.c lrsdriver.h +- ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DPLRS -o mplrsflint mplrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp ++ ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DPLRS $(LDFLAGS) -o mplrsflint mplrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp + + #comment out lines with ${BITS} if __int128 not supported by your C compiler + + lrsgmp: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c +- $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp ++ $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} $(LDFLAGS) -o lrsgmp lrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp + ln -s -f lrsgmp redundgmp + + single: lrs.c lrslong.c lrslong.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c +- $(CC) ${CFLAGS} -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrslong.c lrsdriver.c +- $(CC) ${CFLAGS} ${BITS} -DSAFE -DLRSLONG -o lrs2 lrs.c lrslib.c lrslong.c lrsdriver.c ++ $(CC) ${CFLAGS} -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrslong.c lrsdriver.c ++ $(CC) ${CFLAGS} ${BITS} -DSAFE -DLRSLONG $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrslong.c lrsdriver.c + ln -s -f lrs1 redund1 + ln -s -f lrs2 redund2 + + allmp: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c +- $(CC) -Wall -O3 -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c +- $(CC) -Wall -O3 -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c +- $(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c +- $(CC) -O3 -DLRS_QUIET -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static +- $(CC) -O3 -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c +- $(CC) -O3 -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c +- $(CC) -O3 -o 2nash 2nash.c ++ $(CC) -Wall -O3 $(LDFLAGS) -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c ++ $(CC) -Wall -O3 -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c ++ $(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c ++ $(CC) -O3 -DLRS_QUIET $(LDFLAGS) -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static ++ $(CC) -O3 $(LDFLAGS) -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c ++ $(CC) -O3 $(LDFLAGS) -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c ++ $(CC) -O3 $(LDFLAGS) -o 2nash 2nash.c + + demo: lpdemo1.c lrslib.c lrsdriver.c lrslib.h lrsgmp.c lrsgmp.h +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo lpdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o vedemo vedemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o chdemo chdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo lpdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o vedemo vedemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o chdemo chdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP + + lrsnash: lrsnash.c nashdemo.c lrsnashlib.c lrslib.c lrsnashlib.h lrslib.h lrsgmp.c lrsgmp.h lrslong.h lrsdriver.h lrsdriver.c +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS} +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP +- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o 2nash 2nash.c ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS} ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP ++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o 2nash 2nash.c + cp lrsnashgmp lrsnash + + fel: fel.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c lrslong.c +- $(CC) -O3 -Wall -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp -o felgmp +- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE -o fel1 +- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} -o fel2 ++ $(CC) -O3 -Wall -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp $(LDFLAGS) -o felgmp ++ $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE $(LDFLAGS) -o fel1 ++ $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} $(LDFLAGS) -o fel2 + + ###################################################################### + # From here on the author is David Bremner <bremner@unb.ca> to whom you should turn for help +@@ -228,7 +228,7 @@ SHLIBBIN=lrs-shared lrsnash-shared + # Building (linking) the shared library, and relevant symlinks. + + ${SHLIB}: ${SHLIBOBJ} +- $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ ${SHLIBOBJ} -lgmp ++ $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) $(LDFLAGS) -o $@ ${SHLIBOBJ} -lgmp + + ${SONAME}: ${SHLIB} + ln -sf ${SHLIB} ${SONAME} +@@ -241,11 +241,11 @@ ${SHLINK}: ${SONAME} + all-shared: ${SHLIBBIN} + + lrs-shared: ${SHLINK} lrs-shared.o +- $(CC) $^ -o $@ -L . -llrs ++ $(CC) $^ $(LDFLAGS) -o $@ -L . -llrs + + + lrsnash-shared: ${SHLINK} lrsnash.c +- $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp ++ $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} $(LDFLAGS) -o $@ -L . -llrs -lgmp + + # driver object files + +-- +2.32.0 + diff --git a/sci-libs/lrslib/lrslib-071b-r1.ebuild b/sci-libs/lrslib/lrslib-071b-r1.ebuild new file mode 100644 index 000000000000..b252998413f4 --- /dev/null +++ b/sci-libs/lrslib/lrslib-071b-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Reverse-search algorithm for vertex enumeration problems" +HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html" +SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz" + +# COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version." +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +IUSE="gmp mpi" + +BDEPEND="" +RDEPEND=" + gmp? ( + dev-libs/gmp:0= + mpi? ( virtual/mpi ) + )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-makefile-ldflags.patch" + "${FILESDIR}/${P}-makefile-cflags.patch" +) + +src_prepare() { + default + tc-export CC + + # The "makefile" sort-of supports CFLAGS as of lrslib-071b, but + # "-O3" is still included verbatim in many targets. Likewise, a + # LIBDIR variable exists but "lib" remains hard-coded in the install + # targets. + sed -e "s,/usr/local,${EPREFIX}/usr,g" \ + -e "s,/lib,/$(get_libdir),g" \ + -i makefile || die +} + +src_compile() { + if use gmp ; then + emake + emake all-shared + use mpi && emake mplrs + else + emake allmp + fi +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-common + if use gmp; then + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install + use mpi && dobin mplrs + fi + dodoc README +} diff --git a/sci-libs/lrslib/lrslib-071b.ebuild b/sci-libs/lrslib/lrslib-071b.ebuild new file mode 100644 index 000000000000..dce7bc19ece6 --- /dev/null +++ b/sci-libs/lrslib/lrslib-071b.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Reverse-search algorithm for vertex enumeration problems" +HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html" +SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz" + +# COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version." +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +IUSE="gmp mpi" + +BDEPEND="" +RDEPEND=" + gmp? ( + dev-libs/gmp:0= + mpi? ( virtual/mpi ) + )" +DEPEND="${RDEPEND}" + +src_prepare() { + default + tc-export CC + + # The "makefile" sort-of supports CFLAGS as of lrslib-071b, but + # "-O3" is still included verbatim in many targets. Likewise, a + # LIBDIR variable exists but "lib" remains hard-coded in the install + # targets. + sed -e "s/-O3/${CFLAGS}/g" \ + -e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \ + -e "s,/usr/local,${EPREFIX}/usr,g" \ + -e "s,/lib,/$(get_libdir),g" \ + -i makefile || die +} + +src_compile() { + if use gmp ; then + emake + emake all-shared + use mpi && emake mplrs + else + emake allmp + fi +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-common + if use gmp; then + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install + use mpi && dobin mplrs + fi + dodoc README +} diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest index e93e91362fef..2bcf88c97164 100644 --- a/sci-libs/nlopt/Manifest +++ b/sci-libs/nlopt/Manifest @@ -1,3 +1,3 @@ DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b -EBUILD nlopt-2.6.2-r1.ebuild 2306 BLAKE2B df963811950c922771dbcd537ef6acad0b3c7f7f6a82502f197c5dd5d5cd22602383e63b7d70b991f90e635034e2f539f7ea45a64d006e3f8e38edb096136376 SHA512 96eaad8b212d4ef2af5a9bc81f2f7498535c468340181a41e85f32086d45ec2e7314b6ebd554efadf8b4ef3a6146ee13d55abcb103804472cd32979cf4683514 +EBUILD nlopt-2.6.2-r1.ebuild 2307 BLAKE2B 9c57f104122725bb2660bde7259ff187256d26cffbb4f0bd399acd2b07dcbac522ea4c83ea2196c84a274fe3c188ee61830e0e09d93505a78df1d74618505364 SHA512 858cc72c427ec512c1ef07619fc44230b1b5fe9b1ca68899341a80c13db7a9a1ac82cc8a8dd3d419a832519739ec672361ee3acdb058f31140df9195101fefd9 MISC metadata.xml 1096 BLAKE2B 2b35b6f79c882fbae26b6bc68c75e30b0e2d48f540696cbbc48f06c2686e89a1a5f582d59d2c1ee3b47d5f813f4dbc20cd1d35228c7f968e327e41bb2f1f4da9 SHA512 5776b4b8faa1a6406f1d65bcd9de9ce4087580d98b5c3272804d442905c34d64c6e7d632022425e6e13b12161c94a99906a6196c3624b5b9b4aa1eac6fe9aa1e diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild index 7590eee2b116..01368b67d508 100644 --- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild +++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-r1 cmake fortran-2 diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index 4f8a296219bd..0e863b216583 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -15,7 +15,9 @@ AUX opencascade-7.5.env.in 4683 BLAKE2B 4c7c3764e56110c34c9acb9ecb860936049cf03f DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676 +DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47 EBUILD opencascade-7.4.0-r4.ebuild 3957 BLAKE2B 4118554fff8ff80f64ce581dd5f233211d4a77d4366ada96ae646e819ad03adebfa8561ff9c4b9f9fcfed6cc2bad65fe6db0373d434768fcf5cc8a1808fe34e6 SHA512 a7783c641793480726433be75fd5c7260d9f62e32347aa1ee4e68b97adc5e18d829984f05e84e42c120a1c027c0ad15ee73e646c708466e0eeb2a9440b9726ac EBUILD opencascade-7.5.1-r1.ebuild 4852 BLAKE2B b5738e865f13b49d8a1916c9cb04bd6a6208956f53134ad9513c7a2bfa8428738bf6645a4b6d0fc0c9a9928735ce51feb740bc3138090acc08fa24bcde283403 SHA512 94b96dbc86489e1647d0e1dad5398eb81151039ea2b0124a5b2947397a3a21dde936d1a8fedb798800f54b38fc47b272922ffc5089c3983939e57db3bff36684 EBUILD opencascade-7.5.2.ebuild 4630 BLAKE2B 81587b947cf6bbeb94b1dd0f76dfea82c1df8b385d5b04787c4868b202a6727e53ce3a473d78c71fc623f92d3a61d1f3709f42cd9ba614e16810e3db08600eb8 SHA512 4c1d11556bf65df8e2e2b1dada54547ff60a010e82268c05c31c58388ddd7b1a861b310029f49537a906ecbdebe70e674d4bc127699573a1bb2f63d9bebe24b1 +EBUILD opencascade-7.5.3.ebuild 4630 BLAKE2B 2e612b48bcd63e0b22e53c190e3dbc42986a23a99e8608aadff1e03a9b11f41076b6a8257c4713f1a0fe043f4ff2b3bfbf712f7358280030a24728a02fb34fd1 SHA512 dedc75b9ac633f7b3fa8fd957eb5c447f2a24fa3ef98fa2dc3d3df21fc66dad2e8bc5bd16e6ace0fdd23fdf886bf1981439f98dd7b6ce278644e326311a3fe32 MISC metadata.xml 1075 BLAKE2B ef2b520d3b17f3c74e652d5b8621da87e0e0fce1cd57f3ed9beca402cd41dab95e79e2535103d3dea94cd3a0a8fe7d2983c1243ee3c8727b7d8a2324ae303bd4 SHA512 39cf59672725d33e4c1eae993e1d7612014a3f96285b522601cda9b7757ab5a90d5195c0472e5a6cb5c4d1f7b96e74baab7476e2488dd7cf9f0c85c23a1e466d diff --git a/sci-libs/opencascade/opencascade-7.5.3.ebuild b/sci-libs/opencascade/opencascade-7.5.3.ebuild new file mode 100644 index 000000000000..23b32a161225 --- /dev/null +++ b/sci-libs/opencascade/opencascade-7.5.3.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +MY_PV="$(ver_rs 1- '_')" +PV_MAJ="$(ver_cut 1-2)" + +DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange" +HOMEPAGE="https://www.opencascade.com" +SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz" +S="${WORKDIR}/occt-V${MY_PV}" + +LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" +SLOT="${PV_MAJ}" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk" + +REQUIRED_USE="?? ( optimize tbb )" + +# There's no easy way to test. Testing needs a rather big environment +# properly set up. +RESTRICT="test" + +RDEPEND=" + app-eselect/eselect-opencascade + dev-lang/tcl:= + dev-lang/tk:= + dev-tcltk/itcl + dev-tcltk/itk + dev-tcltk/tix + media-libs/fontconfig + media-libs/freetype:2 + media-libs/ftgl + virtual/glu + virtual/opengl + x11-libs/libXmu + examples? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) + ffmpeg? ( media-video/ffmpeg:= ) + freeimage? ( media-libs/freeimage ) + tbb? ( dev-cpp/tbb ) + vtk? ( sci-libs/vtk:=[rendering] ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen + dev-libs/rapidjson +" +BDEPEND=" + app-eselect/eselect-opencascade + doc? ( app-doc/doxygen ) + examples? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch + "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch + "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch + "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch + "${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch + "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch + "${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch +) + +src_prepare() { + cmake_src_prepare + + use debug && append-cppflags -DDEBUG + + sed -e 's|/lib\$|/'$(get_libdir)'\$|' \ + -i adm/templates/OpenCASCADEConfig.cmake.in || die + + # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some + # assumptions it makes about installation paths. Rather than fixing it, just + # get rid of the mechanism altogether - its purpose is to allow a + # side-by-side installation of release and debug libraries. + sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ + -i adm/cmake/occt_toolkit.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_DOC_Overview=$(usex doc) + -DBUILD_Inspector=$(usex examples) + -DBUILD_WITH_DEBUG=$(usex debug) + -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}" + -DINSTALL_DIR_DOC="share/doc/${PF}" + -DINSTALL_DIR_LIB="$(get_libdir)/${P}" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin" + -DINSTALL_DIR_WITH_VERSION=ON + -DINSTALL_SAMPLES=$(usex examples) + -DINSTALL_TEST_CASES=NO + -DUSE_D3D=NO + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_FREEIMAGE=$(usex freeimage) + -DUSE_FREETYPE=ON + -DUSE_GLES2=$(usex gles2) + -DUSE_RAPIDJSON=$(usex json) + -DUSE_TBB=$(usex tbb) + -DUSE_VTK=$(usex vtk) + ) + + use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON ) + + if use examples; then + mycmakeargs+=( + -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr + -DBUILD_SAMPLES_QT=ON + ) + fi + + if use vtk; then + if has_version ">=sci-libs/vtk-9.0.0"; then + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + fi + fi + + cmake_src_configure + + # prepare /etc/env.d file + sed -e "s|lib/|$(get_libdir)/|" \ + -e "s|VAR_PV|${PV}|" \ + -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \ + < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die + + # use TBB for memory allocation optimizations + if use tbb; then + sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || die + fi + + # use internal optimized memory manager and don't clear memory with this + # memory manager. + if use optimize ; then + sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \ + -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \ + -i "${T}"/${PV_MAJ} || die + fi +} + +src_install() { + cmake_src_install + + # respect slotting + insinto "/etc/env.d/${PN}" + doins "${T}/${PV_MAJ}" + + # remove examples + if use !examples; then + rm -r "${ED}/usr/share/${P}/samples" || die + fi + + docompress -x /usr/share/doc/${PF}/overview/html +} + +pkg_postinst() { + eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation" + einfo "You can switch between available ${PN} implementations using eselect ${PN}" +} diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest index 92736d8a13de..0d80032f6932 100644 --- a/sci-libs/pastix/Manifest +++ b/sci-libs/pastix/Manifest @@ -5,6 +5,6 @@ AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95 -EBUILD pastix-5.2.3.ebuild 3349 BLAKE2B dbe716c332aad225831c749afbd12b8614dd0f05c4e9273102b935a60e01353e8ed7e7489e6674574ff2a9de18e39913213c6dd1338d6fec93ea856f0f57909c SHA512 a9b88e42904393acb56607bca886357d0b320acee7fb82b96987b274aa27c18b53de5e97c576ed2376a31e29a4b76ddc081da4b9e2ab65d357476339a29add6f +EBUILD pastix-5.2.3.ebuild 3355 BLAKE2B 00b07e37bc87ef19a977084adef2e41c6208eb546f60f0fbe5bcaf2aff295565a06bbdb79aaf9974563a7a0e9bc7964bf926ddeaa8a9fead63a1fa4f5dbbb98f SHA512 90107a7ce7a4e9413ece0e587f7882fd48b91705a99cb14ef3f76afb5212966e884d23b3392f011632b2d59d40954e8f6d6581b4b786a0dba4fc1b0ad8ebb3c0 EBUILD pastix-6.0.3.ebuild 2374 BLAKE2B 58133bf3238c1d5108e5f1c70db54319ae3f6a62f673b9b815c64ac5fbf9efa92b0895e36c5b75f9d0e8b0eedfcdb17a56e32c85d5cd718741dcc43995c410d8 SHA512 4cb031a9cb4281f20d629a7f6f950e768c2d95437d1480ce91357a97bed735e3ddfcc6e397b57a39e90e2ed5941b1dd3e5a924d7844d3ca94bf36a94ce55a6f4 MISC metadata.xml 1383 BLAKE2B 0a17508eb75ed0066dbbaad286cb00ddd8491aa5b6047f2f32fde75f5e43277233229d4935d94052000c662e729480aaa02cdcbd4572e4b84075f108b1c61800 SHA512 9cc80da6ccb82311e30288696cce006e858121a8d216ba2860a1c0ae833c8e8076d60cd783283d163528976bfd9af11d114fc95a481b36951b5d7caf3c0fad2c diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild index 4e2083d49a7f..9e3d9459f74b 100644 --- a/sci-libs/pastix/pastix-5.2.3.ebuild +++ b/sci-libs/pastix/pastix-5.2.3.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}. LICENSE="CeCILL-C" SLOT="0" -KEYWORDS="amd64 arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc int64 mpi +smp starpu static-libs" RDEPEND=" diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest index 2b463f13fbce..f99e0d2ea18b 100644 --- a/sci-libs/scotch/Manifest +++ b/sci-libs/scotch/Manifest @@ -3,7 +3,7 @@ AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89 DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2 -EBUILD scotch-6.0.4-r2.ebuild 5045 BLAKE2B 6e67c4623fd0d718d9f4b83fe5e4c36ebb296e5a746a356257fd853bd499df2bdfa7019d2da597867926bedd1dd4ecf8e899eb5dc69696b95bc9d0d2ba817a88 SHA512 2cda8cd3fac970a8fb637f49a6fe8def310e6af30a3491021a0d3662c704020f52a7cdbfd36106444b955a0c46d85edf9ace500477da0c31ecb0122faee28edc +EBUILD scotch-6.0.4-r2.ebuild 5044 BLAKE2B bac0078d623212ab0e4782023abb24f4f7026af9d80ee69dcde5ee55dc39e5fb1790cedeb19b484f64ac7c1e3fbe010f898b4decaec30d1c7888e3e72612bac5 SHA512 84ab1f209ebfbf2bf6f519b34775e0b8321a2f5b53086ad355f7c3539c3dfa4798aedbc3bd0c647c8214f75e2d11c9618f9bd07c7449333acdd63e2a2285e993 EBUILD scotch-6.1.0-r1.ebuild 4954 BLAKE2B 6f3067d0ffa3e230bdcdf6748dac63153f4978f4b018527efb7fa92eaf3fbd361bcc257d36559936a2c5be25c2591eb26fb1a266b1b1208c4a722f0ce126712b SHA512 ca7f02520153c68aafbcb687fd85a548ed5aa6df44b5c086063a6507152737b58b2b1c987676526882524f6d120939c88b4c16d193a8819049b1e5f76bef8e80 EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e EBUILD scotch-6.1.1.ebuild 4956 BLAKE2B 90be76fd85e027e5649cf580e683168dc07010b1e4369a6c642d2b94aeb191b9f9944f416160d19117507dccab39dc643a3bb0db130ec691174adefef1129d33 SHA512 be8ef59bf19d25ccf85f4d5aa705f05f6d226f48e05d7d2b65d3fe52297ee6bbd944130119b781a1109fb1c47dbb2de95490c1c555c1058d9b972b06b9230463 diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild index 7f41e2ef543f..11c8a9fc4f8d 100644 --- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild +++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${P/-/_}" LICENSE="CeCILL-2" SLOT="0/${SOVER}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc int64 mpi static-libs test tools threads" # bug #532620 REQUIRED_USE="test? ( threads )" diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest index 34d49bfcf0af..5beaab1d5814 100644 --- a/sci-libs/superlu/Manifest +++ b/sci-libs/superlu/Manifest @@ -5,6 +5,6 @@ DIST superlu-5.3.0.tar.gz 2483070 BLAKE2B 2e877c12b698fae6649d3146d4a22a8c701df8 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c EBUILD superlu-4.3-r2.ebuild 1641 BLAKE2B b11715c747a425f2a7e04568a994ca9973c228b2f811423d7e502659ce6bcc723899645aaf883ed9ef9b3a696645d0263c92ba7ea988efc3a32d297498ac5f37 SHA512 0d667b80c3f443786fe0e8b6fb93c20617b0ac8a2c1393204bd1a0fb1d9a3b6612fc47af48a089e2e99daf728441e3fca07b0cc4404b249d761e188f678f5d76 -EBUILD superlu-5.2.2.ebuild 1176 BLAKE2B 652712da2a495689e09e6aa3a0ee2c57d98f576d4c043d88c93c8aed7b380e278ed9ebbe60c3653191090ebc78cf23a4139844df7cf4b15a27cfad463dc98170 SHA512 c0a3a7aede1ad66ba964f32c5d5e5235df9119cb261cb6a48c68872cb0b5425665cf9beac930a7823bda7fc999a904a673faf905b59feafaa3e5bc3b532a61a3 +EBUILD superlu-5.2.2.ebuild 1175 BLAKE2B 61b4d96dcf31903141b16f08c6121ee086777d39ad75a473a458de2a9a7b95b9c34abdbbe226cab0d83094e41f4ab3f3b46ac88b9a36f4867212c7d1a116a499 SHA512 dbe5516b1cd20f5750c8232cb6d027790d66e2447b9a4b3d2bc65e043b8e6075d77ffe715a6040ee3c1635901d30abac21fdeb0e262356d6bc9fcefaa298e6e1 EBUILD superlu-5.3.0.ebuild 1209 BLAKE2B 929faf5db2ee3704daa313a89e0101cb41a49cd3ed4c8eb9993a56b241aa4bd82d6f85fdd8f947ceb35e3d4fbea31a6d579e2e28554b1587a991f3dac248c25d SHA512 f3cd7dccef3044baf01fbe371ffa3914971c2296d14030d1abe35d09992af8d865c9c8f35d7abed0cc7dc8512211f70943a1a10942923b6f41fd139364bd98f8 MISC metadata.xml 1405 BLAKE2B 37c946ec0b73a5bdbd2b856cf571475ed8e85e220f200bde8028278dafb8ace158c21d42c9a4a2e7c3373ac4c5bdd4e39cef7947113d99baea5bd86992912dd0 SHA512 6e07a544afc19f7704a7babf09441a223b24f7772bbf856e06889ffac2ac09f20ef9e8a03003407e0ce372db42850cd075560c4b006082f4fcc569786bf868ad diff --git a/sci-libs/superlu/superlu-5.2.2.ebuild b/sci-libs/superlu/superlu-5.2.2.ebuild index 758d09bbdbe4..941e8e09ba7a 100644 --- a/sci-libs/superlu/superlu-5.2.2.ebuild +++ b/sci-libs/superlu/superlu-5.2.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz" LICENSE="BSD" SLOT="0/$(ver_cut 1)" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples test" RESTRICT="!test? ( test )" diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest index ad0886bd773a..622fe319a7eb 100644 --- a/sci-libs/tensorflow/Manifest +++ b/sci-libs/tensorflow/Manifest @@ -1,4 +1,3 @@ -AUX 0008-patch-ruy-for-gcc-11.patch 1271 BLAKE2B 97c047175a0d9aa003de1dfa8ee8fe9fb88ffdc05e3f021c02260cb2350f1e33d65cb3ad664669213cbf6a28f35f3a1de37cec2159e3490522254b41696389f5 SHA512 80ffc381900e09b23b59477cd85b28e2b3d4a995404e65b79efaecd160f81ab1318656a1f0181ee695a47246002da5ea02095e97e32e24828ac33b2c933b1902 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9 DIST OouraFFT-v1.0.tar.gz 110531 BLAKE2B de0e280407e21118e2bc6ca93a7caf3c4a49d0a13eda018b1497f98851af73dda4cef56460dba310336c7ed958e34feef4784ca2575a13287dec2c1ac9a5af6d SHA512 89c6e8fd57abf26351b3efb792008a1bbe62d404a4225dcae8aa666b3782a421be071bdc9760ebb0c95b5336ee5ea517d2fa43ab915045f7cf6fd76e73578079 DIST abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz 1785034 BLAKE2B 83cee194b416fff3d6ec3f4c02b4210a60ebfcf0316524fe9deb94372bfc34f33075fa59e2e71d8bb17c32f61a6e324072651c2bbf382d3d4a7540657b8a33a8 SHA512 f64fee62863f2103c1991136fd3bc2b71cd28c7ff62138ac991b5a7f81780a05e0e2bdd6a119d02e1d70dd54f989f584093957efaec94f26c9d6c3f4ee37f8ae @@ -32,9 +31,7 @@ DIST ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip 363561 BLAKE2B 81ff61f1a12 DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856 DIST tensorflow-2.5.0.tar.gz 55999506 BLAKE2B 0f1f29ed9ff6e5fd3fc0c98419bca636f48085810f934290885b3469c45817b2ce17e9dbd3d93d70b09ec7975088edd0973f147449f527a8f2e23b388e2592ce SHA512 637c63b1bed1c0eb7bb018f1ff7f29f7f0d78e75dac384df4ecb5dfb92bbcb28209e3d3d2204145abddf88e3247d8c31bbb4cea032a73b7122b2ef3eb0d2b947 -DIST tensorflow-patches-2.5.0-r1.tar.bz2 5180 BLAKE2B aafebb5cc4616ad93982e0fd8299f91c22063b96841b920a98a4cb54bcdc0cad51011f943ca62055239a0c21ed69d1f5b985710dcf0c28346b7ba12114583842 SHA512 38acd53136f3f1e061b71624cc5a1cefbdcb1d897b7728bc93462e8f52e998c3d72453ca9c94fa53dd28279cae5c591b7cbe9f61684784ff94c451a641524f31 -DIST tensorflow-patches-2.5.0-r2.tar.bz2 5538 BLAKE2B df289d77a79bb2143ebe26685f3c8f2efe64819a2fd6bd9866bc05638d2c19e822ddb90df3f342f1fc27827b3799531ad4ed280f9cc5291e75b1c2042a61603f SHA512 4f5ecb4efb56e735ee79dd07e0e8737f535da4e9ba8f63f769d548813e5aa7017e03cd1bd0d661e1958fa2916df7c7f25a7c0d141dbfe9716586ca82c021169f +DIST tensorflow-patches-2.5.0-r3.tar.bz2 6385 BLAKE2B 5cd3a9639884aa67bbd192cb1b06cfedc557b8ad05aca0f4887987c615656620b9294de98b119bf9d6edafd5b56b9d5e6900f95adb06a3a49cfdf342c6195b22 SHA512 8f0d2be9ffed81aba5c85088a79ca56af889e0247516f51657d214d19d39877cfe331e60f63e8c54e2b12acd7a624b181e281534acbd9a103f6eec0aae70fd8a DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e -EBUILD tensorflow-2.5.0-r1.ebuild 15608 BLAKE2B 6719de1a01b17354c17e5648ecf52ce77d296bbeceaafefef4ca4f03651fbfb097629cdf2fc68aa355cdcf3f6dc20d38cbad91ca1e2fd9330761db46fac75c47 SHA512 ae9c082b8c7d251cfdbf15d153b504865c10a1e86087155df158ee187df88f7779c0505c019806b162fbc214b12d7424e58cbff733c55713be3506c986407742 -EBUILD tensorflow-2.5.0-r2.ebuild 15607 BLAKE2B 75450401229fda615b38dab3d3cbd56d18114a13fcf0b58c1b6b45cd319048a1efad85bdd0263cff5f197ebde1aecf06b6a7e8cf3eb9695dbbefa7b2f4d93279 SHA512 b34bf5612e9ba415e3d3211912eb0ab011709ce507a0754defdda51985cbe9af86189f664f509f7e4035c99b506b3c12492e729ad95250975acc8a7273b0344a +EBUILD tensorflow-2.5.0-r3.ebuild 15609 BLAKE2B 7de8607494601c61a8cd5403f08147ec9ed6fa32907f986318ba15e47da72b374922e72a3289beba89ac3bd913c9569932f466a9b7f4eb3133ae43f97a0d04c5 SHA512 8e524f76447e22f94c6737b00602878c28162afa98f95bf4b291df0a16de97ef4a51836fcd6c23a23897b824d17d25c186f187d7de37004501376e91790d2a02 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28 diff --git a/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch b/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch deleted file mode 100644 index 3bb2cf2e1cbe..000000000000 --- a/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/third_party/ruy/commit-3c93cda.patch b/third_party/ruy/commit-3c93cda.patch -new file mode 100644 -index 00000000000..e530a842717 ---- /dev/null -+++ b/third_party/ruy/commit-3c93cda.patch -@@ -0,0 +1,21 @@ -+From 3c93cda8211efa01128d48950f0d6ee5233c5b9b Mon Sep 17 00:00:00 2001 -+From: stha09 <51720730+stha09@users.noreply.github.com> -+Date: Thu, 6 May 2021 18:31:30 +0200 -+Subject: [PATCH] IWYU: include limits for std::numeric_limits (#253) -+ -+--- -+ ruy/block_map.cc | 1 + -+ 1 file changed, 1 insertion(+) -+ -+diff --git a/ruy/block_map.cc b/ruy/block_map.cc -+index 6c01e52a02..e04e7aff4a 100644 -+--- a/ruy/block_map.cc -++++ b/ruy/block_map.cc -+@@ -17,6 +17,7 @@ limitations under the License. -+ -+ #include <algorithm> -+ #include <cstdint> -++#include <limits> -+ -+ #ifdef RUY_MAKEBLOCKMAP_DEBUG -+ #include <cstdio> -diff --git a/third_party/ruy/workspace.bzl b/third_party/ruy/workspace.bzl -index 50769621770..7e91d640469 100644 ---- a/third_party/ruy/workspace.bzl -+++ b/third_party/ruy/workspace.bzl -@@ -12,4 +12,5 @@ def repo(): - "https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip", - ], - build_file = "//third_party/ruy:BUILD", -+ patch_file = "//third_party/ruy:commit-3c93cda.patch" - ) diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild deleted file mode 100644 index 5f4f341f0cbb..000000000000 --- a/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild +++ /dev/null @@ -1,413 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs - -DESCRIPTION="Computation framework using data flow graphs for scalable machine learning" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda mpi +python xla" -CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4" -for i in $CPU_USE_FLAGS_X86; do - IUSE+=" cpu_flags_x86_${i}" -done - -# distfiles that bazel uses for the workspace, will be copied to basel-distdir -bazel_external_uris=" - https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz - https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz - https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip - https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip - https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz - https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz - https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip - https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz - https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz - https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz - https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz - https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz - https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip - https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz - https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz - https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip - https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz - https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz - https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz - https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz - https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz - https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz - https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip - https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz - https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz - https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz - cuda? ( - https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip - https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip - https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz - ) - python? ( - https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz - https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt - https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz - )" - -SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2 - ${bazel_external_uris}" - -RDEPEND=" - app-arch/snappy - dev-db/lmdb - dev-db/sqlite - dev-libs/double-conversion - dev-libs/icu:= - >=dev-libs/jsoncpp-1.9.2 - dev-libs/libpcre - dev-libs/nsync - dev-libs/openssl:0= - >=dev-libs/protobuf-3.13.0:= - >=dev-libs/re2-0.2019.06.01:= - media-libs/giflib - media-libs/libjpeg-turbo - media-libs/libpng:0 - >=net-libs/grpc-1.28:= - net-misc/curl - sys-libs/zlib - >=sys-apps/hwloc-2 - cuda? ( - =dev-util/nvidia-cuda-toolkit-11*[profiler] - =dev-libs/cudnn-8* - ) - mpi? ( virtual/mpi ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/flatbuffers-1.12.0:= - dev-python/absl-py[${PYTHON_USEDEP}] - >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] - dev-python/astunparse[${PYTHON_USEDEP}] - dev-python/dill[${PYTHON_USEDEP}] - dev-python/flatbuffers[${PYTHON_USEDEP}] - >=dev-python/gast-0.3.3[${PYTHON_USEDEP}] - dev-python/h5py[${PYTHON_USEDEP}] - >=dev-python/numpy-1.19[${PYTHON_USEDEP}] - >=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}] - >=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/tblib[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - >=dev-python/grpcio-1.28[${PYTHON_USEDEP}] - >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}] - >=net-libs/google-cloud-cpp-0.10.0 - >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] - >=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}] - >=sci-visualization/tensorboard-2.5.0[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - python? ( - dev-python/mock - dev-python/setuptools - )" -PDEPEND="python? ( - >=sci-libs/tensorflow-estimator-2.5.0[${PYTHON_USEDEP}] - )" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.8.0 - dev-java/java-config - >=dev-util/bazel-3.7.2 - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - ) - !python? ( dev-lang/python ) - python? ( - dev-python/cython - dev-python/mock - >=dev-python/grpcio-tools-1.28 - )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/0008-patch-ruy-for-gcc-11.patch" -) -DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) -CHECKREQS_MEMORY="5G" -CHECKREQS_DISK_BUILD="10G" - -get-cpu-flags() { - local i f=() - # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc. - for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do - use cpu_flags_x86_${i} && f+=( -m${i/_/.} ) - done - use cpu_flags_x86_fma3 && f+=( -mfma ) - echo "${f[*]}" -} - -pkg_setup() { - ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities" - ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:" - ewarn "https://www.tensorflow.org/guide/migrate" - - local num_pythons_enabled - num_pythons_enabled=0 - count_impls() { - num_pythons_enabled=$((${num_pythons_enabled} + 1)) - } - use python && python_foreach_impl count_impls - - # 10G to build C/C++ libs, 5G per python impl - CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G" - check-reqs_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack "${P}.tar.gz" - unpack tensorflow-patches-${PVR}.tar.bz2 - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - append-flags $(get-cpu-flags) - append-cxxflags -std=c++14 # bug 787938 - filter-flags '-fvtable-verify=@(std|preinit)' - bazel_setup_bazelrc - - eapply "${WORKDIR}"/patches/*.patch - - # Relax version checks in setup.py - sed -i "/^ '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die - sed -i "/config_googleapis/d" tensorflow/workspace0.bzl || die - - # Prefixify hard-coded command locations - hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl - - default - use python && python_copy_sources - - use cuda && cuda_add_sandbox -} - -src_configure() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - do_configure() { - export CC_OPT_FLAGS=" " - export TF_ENABLE_XLA=$(usex xla 1 0) - export TF_NEED_OPENCL_SYCL=0 - export TF_NEED_OPENCL=0 - export TF_NEED_COMPUTECPP=0 - export TF_NEED_ROCM=0 - export TF_NEED_MPI=$(usex mpi 1 0) - export TF_SET_ANDROID_WORKSPACE=0 - - if use python; then - export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="$(python_get_sitedir)" - else - export PYTHON_BIN_PATH="$(which python)" - export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" - fi - - export TF_NEED_CUDA=$(usex cuda 1 0) - export TF_DOWNLOAD_CLANG=0 - export TF_CUDA_CLANG=0 - export TF_NEED_TENSORRT=0 - if use cuda; then - export TF_CUDA_PATHS="${EPREFIX}/opt/cuda" - export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" - export TF_CUDA_VERSION="$(cuda_toolkit_version)" - export TF_CUDNN_VERSION="$(cuda_cudnn_version)" - einfo "Setting CUDA version: $TF_CUDA_VERSION" - einfo "Setting CUDNN version: $TF_CUDNN_VERSION" - - if [[ $(cuda-config -s) != *$(gcc-version)* ]]; then - ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler" - ewarn "version is not supported by the currently installed CUDA. TensorFlow will" - ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}." - ewarn "If the build fails with linker errors try rebuilding the relevant" - ewarn "dependencies using the same compiler version." - fi - - if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then - ewarn "WARNING: TensorFlow is being built with its default CUDA compute capabilities: 3.5 and 7.0." - ewarn "These may not be optimal for your GPU." - ewarn "" - ewarn "To configure TensorFlow with the CUDA compute capability that is optimal for your GPU," - ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5" - ewarn "" - ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" - ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" - fi - fi - - # com_googlesource_code_re2 weird branch using absl, doesnt work with released re2 - #com_github_googleapis_googleapis - local SYSLIBS=( - absl_py - astor_archive - astunparse_archive - boringssl - com_github_googlecloudplatform_google_cloud_cpp - com_github_grpc_grpc - com_google_protobuf - curl - cython - dill_archive - double_conversion - enum34_archive - flatbuffers - functools32_archive - gast_archive - gif - hwloc - icu - jsoncpp_git - libjpeg_turbo - lmdb - nasm - nsync - opt_einsum_archive - org_sqlite - pasta - pcre - png - pybind11 - six_archive - snappy - tblib_archive - termcolor_archive - typing_extensions_archive - wrapt - zlib - ) - - export TF_SYSTEM_LIBS="${SYSLIBS[@]}" - export TF_IGNORE_MAX_BAZEL_VERSION=1 - - # This is not autoconf - ./configure || die - - echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die - echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die - echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die - echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die - - for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags) - do - echo "build --copt=\"${cflag}\"" >> .bazelrc || die - echo "build --host_copt=\"${cflag}\"" >> .bazelrc || die - done - } - if use python; then - python_foreach_impl run_in_build_dir do_configure - else - do_configure - fi -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - if use python; then - python_setup - BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" - fi - - # fail early if any deps are missing - ebazel build -k --nobuild \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so \ - //tensorflow:libtensorflow_cc.so \ - $(usex python '//tensorflow/tools/pip_package:build_pip_package' '') - - ebazel build \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so - ebazel build //tensorflow:libtensorflow_cc.so - - do_compile() { - ebazel build //tensorflow/tools/pip_package:build_pip_package - } - BUILD_DIR="${S}" - cd "${BUILD_DIR}" - use python && python_foreach_impl run_in_build_dir do_compile - ebazel shutdown -} - -src_install() { - local i l - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras - - do_install() { - einfo "Installing ${EPYTHON} files" - local srcdir="${T}/src-${MULTIBUILD_VARIANT}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die - cd "${srcdir}" || die - esetup.py install - - # libtensorflow_framework.so is in /usr/lib already - rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die - rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die - python_optimize - } - - if use python; then - python_foreach_impl run_in_build_dir do_install - - # Symlink to python-exec scripts - for i in "${ED}"/usr/lib/python-exec/*/*; do - n="${i##*/}" - [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}" - done - - python_setup - local BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - einfo "Installing headers" - ebazel build //tensorflow:install_headers - ebazel shutdown - insinto /usr/include/${PN}/ - doins -r bazel-bin/tensorflow/include/* - - einfo "Installing libs" - # Generate $(tc-getPKG_CONFIG) file - ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc ${PN}_cc.pc - - for l in libtensorflow{,_framework,_cc}.so; do - dolib.so bazel-bin/tensorflow/${l} - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1) - dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3) - done - - einstalldocs -} diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r2.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild index 3bfe94d961f9..ee65934a9f4b 100644 --- a/sci-libs/tensorflow/tensorflow-2.5.0-r2.ebuild +++ b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild @@ -87,7 +87,10 @@ RDEPEND=" sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( - =dev-util/nvidia-cuda-toolkit-11*[profiler] + || ( + =dev-util/nvidia-cuda-toolkit-10*[profiler] + =dev-util/nvidia-cuda-toolkit-11.4*[profiler] + ) =dev-libs/cudnn-8* ) mpi? ( virtual/mpi ) @@ -143,9 +146,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}/0008-patch-ruy-for-gcc-11.patch" -) DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) CHECKREQS_MEMORY="5G" CHECKREQS_DISK_BUILD="10G" |