diff options
Diffstat (limited to 'sci-libs/armadillo')
| -rw-r--r-- | sci-libs/armadillo/Manifest | 5 | ||||
| -rw-r--r-- | sci-libs/armadillo/armadillo-11.4.0.ebuild | 156 | ||||
| -rw-r--r-- | sci-libs/armadillo/armadillo-12.4.0-r1.ebuild | 2 | ||||
| -rw-r--r-- | sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch | 12 |
4 files changed, 2 insertions, 173 deletions
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index c070e81fead9..d38aed5dac36 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,7 +1,4 @@ -AUX armadillo-11.4.0-extratests.patch 720 BLAKE2B 0024513a1ffa752d4cd32de926f1702aaf35f32ffebad8d1b859cab96819dd57075f0ff36e9917b91d10a408215aa815af5fa14adfa8449656d4a6333d9f7154 SHA512 b13fb2d2bd6b3de2c7d0ab423f1569302bcaa8fecc52a7f999068d445842f81ff9da846c9008c5abebe3613ccdc791e201eec0bfc931ce82664213bd06371241 AUX armadillo-12.0.1-extratests.patch 743 BLAKE2B bd8bf0a2fd9ec52875804b92a86f2fe8a24e92008208071cd65bd78eb6fe92aac7add687be9455f276f8fd84f50208e2b6846f8c40cd521dd18e623284af94dd SHA512 de804fc620454ba41b859b4cc90583f25e82670f4f9c49dab27ac803529e024293e6254824eadafeb0b9c13a90696b9717aea338a672101c123e1f88493da113 -DIST armadillo-11.4.0.tar.xz 6804388 BLAKE2B cb44d248cf817f66cc0b6aa968535e266282775b20035f46f3158687100c0f49c6cf4fad8d1f2ec1741f9bceb06c5a841f20f3b7e59146f2fe57c86d00741434 SHA512 21d58b383229f55bf6a3b217c04901982b484b6d806dd3c4a72ebe5a9614f63f9429ca31ea7cfc26672b70e01a0b9263a9d4edf69a0080706ade87852f94970c DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f855039cc81c3300c83e5e932ee4cda233731b53623303c1c739feae9b007f8f6309c09debe79923e3876e8145015152 SHA512 a9f8cd19384eed787787b9e189901a1800e6e1dd06917f4f13e8a215c83f317de3e5b0ae8625783f88d9a7b0ab25f5c7784ccf0493c08a9ee3ea7fdfbbe36195 -EBUILD armadillo-11.4.0.ebuild 3581 BLAKE2B e5eb2510115f93e08c6de5e33fa8168cce1449987ba066c76af682727a4dc4dd53722c241a7d5d347444550052b9c547f73d47c106f8efdc60e96797eb0c69e0 SHA512 ec11cf179311501c77eb6a3e80a52386b2122fe470e72508b88431bffd064dc494b2ba414b4ac7b3d42d0ff685d2b23dc602afc36988ac90e7fe7cd05f697643 -EBUILD armadillo-12.4.0-r1.ebuild 3282 BLAKE2B 3443e5d48d636df61e193a3fd494abd2c5b5ae41a89c2edc84888ad2c681151f0ac355362018629e207cc8cf8976ab69e4ae4fce93106f8795e8916b8e403995 SHA512 18256b807c159c87cc55a9704c6f09e08568bc9281dcbb8ab1f46e21dae6227e1769487edd24c7eaa02b4f82faa953b186d9977943a15cd5093e4d7b12859031 +EBUILD armadillo-12.4.0-r1.ebuild 3281 BLAKE2B f3e0ea58d8a43e14bc7dc77d803e4736f311892010facd17b60071545f2c69bf31a496cf71945c348861943f6dcea409a22e9407b19a50c78d7dd16442c17677 SHA512 aba6256ffcd15eecb0b0348b6b64171fca4b73dfb8f04d07391a857bc60eca6c50b7288d88c026f30a7e5a3b22cf9db117dd216cfd8576289745dde39adf3155 MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0 diff --git a/sci-libs/armadillo/armadillo-11.4.0.ebuild b/sci-libs/armadillo/armadillo-11.4.0.ebuild deleted file mode 100644 index d515a111faaf..000000000000 --- a/sci-libs/armadillo/armadillo-11.4.0.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake toolchain-funcs multilib - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="https://arma.sourceforge.net" -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0/11" -KEYWORDS="amd64 ~arm ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( arpack lapack superlu )" - -# atlas? ( sci-libs/atlas[lapack] ) - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack ) - superlu? ( >=sci-libs/superlu-5.2 ) -" - -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5:= ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) -" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5:= ) - mkl? ( sci-libs/mkl ) -" - -PATCHES=( - "${FILESDIR}/${P}-extratests.patch" -) - -src_prepare() { - # avoid the automagic cmake macros... - sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die - - # ... except for mkl, since without a license it's hard to figure out what to do there - if use mkl; then - sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - ) - if use arpack; then - mycmakeargs+=( - -DARPACK_FOUND=ON - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" - ) - else - mycmakeargs+=( - -DARPACK_FOUND=OFF - ) - fi -# if use atlas; then -# local c=atlas-cblas l=atlas-clapack -# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads -# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads -# mycmakeargs+=( -# -DCBLAS_FOUND=ON -# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" -# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" -# -DCLAPACK_FOUND=ON -# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" -# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" -# ) -# fi - if use blas; then - mycmakeargs+=( - -DBLAS_FOUND=ON - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" - ) - else - mycmakeargs+=( - -DBLAS_FOUND=OFF - ) - fi - if use hdf5; then - mycmakeargs+=( - -DDETECT_HDF5=ON - -DHDF5_LIBRARIES="-lhdf5" - -DHDF5_INCLUDE_DIRS=/usr/include - ) - else - mycmakeargs+=( - -DDETECT_HDF5=OFF - ) - fi - if use lapack; then - mycmakeargs+=( - -DLAPACK_FOUND=ON - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - else - mycmakeargs+=( - -DLAPACK_FOUND=OFF - ) - fi - if use superlu; then - mycmakeargs+=( - -DSuperLU_FOUND=ON - -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" - -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" - ) - else - mycmakeargs+=( - -DSuperLU_FOUND=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - cmake_src_test || die - - pushd tests2 > /dev/null - emake \ - CXX="$(tc-getCXX)" \ - CXX_FLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ - LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./main || die - emake clean - popd > /dev/null -} - -src_install() { - cmake_src_install - - dodoc README.md - use doc && dodoc *pdf *html - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild b/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild index a0ed25efdfca..8139c09c283a 100644 --- a/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild +++ b/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" LICENSE="Apache-2.0" SLOT="0/12" -KEYWORDS="~amd64 ~arm ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="arpack blas doc examples lapack mkl superlu test" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( arpack lapack superlu )" diff --git a/sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch b/sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch deleted file mode 100644 index 7efb67b5b139..000000000000 --- a/sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN armadillo-11.4.0.orig/tests2/Makefile armadillo-11.4.0/tests2/Makefile ---- armadillo-11.4.0.orig/tests2/Makefile 2022-10-03 19:26:59.699937940 +0200 -+++ armadillo-11.4.0/tests2/Makefile 2022-10-03 19:27:24.954277418 +0200 -@@ -3,7 +3,7 @@ - #LIB_FLAGS = -lblas -llapack - #LIB_FLAGS = -lopenblas -llapack - --CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -+#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 - #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -fopenmp - #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -DARMA_DONT_USE_WRAPPER - #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -fsanitize=address -fsanitize=leak -fsanitize=undefined -fsanitize=bounds -fsanitize=bounds-strict -g |