From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C68B1139360 for ; Wed, 4 Aug 2021 17:40:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7162E0948; Wed, 4 Aug 2021 17:40:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78DE0E0948 for ; Wed, 4 Aug 2021 17:40:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F253D342B6E for ; Wed, 4 Aug 2021 17:40:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43EFB83B for ; Wed, 4 Aug 2021 17:40:53 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1628098838.8a28b1b1c96d39b5fac0f48ec814879f4660b3fd.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/libsc/libsc-2.3.1-r1.ebuild sci-libs/libsc/libsc-2.3.1.ebuild sci-libs/libsc/libsc-9999.ebuild X-VCS-Directories: sci-libs/libsc/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8a28b1b1c96d39b5fac0f48ec814879f4660b3fd X-VCS-Branch: master Date: Wed, 4 Aug 2021 17:40:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 53cf9cee-e563-4c2e-907e-4c8918d0a758 X-Archives-Hash: 448d938f53986cc04d7122df8905a9fe commit: 8a28b1b1c96d39b5fac0f48ec814879f4660b3fd Author: David Seifert gentoo org> AuthorDate: Wed Aug 4 17:40:38 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Aug 4 17:40:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a28b1b1 sci-libs/libsc: remove USE=static-libs Signed-off-by: David Seifert gentoo.org> .../{libsc-2.3.1.ebuild => libsc-2.3.1-r1.ebuild} | 37 +++++++++++----------- sci-libs/libsc/libsc-9999.ebuild | 37 +++++++++++----------- 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/sci-libs/libsc/libsc-2.3.1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild similarity index 81% rename from sci-libs/libsc/libsc-2.3.1.ebuild rename to sci-libs/libsc/libsc-2.3.1-r1.ebuild index e84c20273cf..667c713b009 100644 --- a/sci-libs/libsc/libsc-2.3.1.ebuild +++ b/sci-libs/libsc/libsc-2.3.1-r1.ebuild @@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs DESCRIPTION="Support for parallel scientific applications" HOMEPAGE="http://www.p4est.org/" -if [[ ${PV} = *9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" EGIT_BRANCH="develop" - SRC_URI="" else SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -22,35 +21,32 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="debug examples mpi openmp romio static-libs threads" - -REQUIRED_USE="${LUA_REQUIRED_USE} +IUSE="debug examples mpi openmp romio threads" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} romio? ( mpi )" -RDEPEND="${LUA_DEPS} +RDEPEND=" + ${LUA_DEPS} sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch "${FILESDIR}"/${PN}-2.3-add_soname.patch ) -DOCS=( AUTHORS NEWS README ) - -AUTOTOOLS_AUTORECONF=true - pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then - tc-has-openmp || \ - die "Please select an openmp capable compiler like gcc[openmp]" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + lua-single_pkg_setup } src_prepare() { @@ -65,11 +61,11 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" @@ -98,4 +94,7 @@ src_install() { rmdir "${ED}"/etc/ || die "rmdir failed" mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" rmdir "${ED}"/usr/share/ini || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild index b99e7232521..00143eccd87 100644 --- a/sci-libs/libsc/libsc-9999.ebuild +++ b/sci-libs/libsc/libsc-9999.ebuild @@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs DESCRIPTION="Support for parallel scientific applications" HOMEPAGE="http://www.p4est.org/" -if [[ ${PV} = *9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" EGIT_BRANCH="develop" - SRC_URI="" else SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -22,34 +21,31 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="debug examples mpi openmp romio static-libs threads" - -REQUIRED_USE="${LUA_REQUIRED_USE} +IUSE="debug examples mpi openmp romio threads" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} romio? ( mpi )" -RDEPEND="${LUA_DEPS} +RDEPEND=" + ${LUA_DEPS} sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch ) -DOCS=( AUTHORS NEWS README ) - -AUTOTOOLS_AUTORECONF=true - pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then - tc-has-openmp || \ - die "Please select an openmp capable compiler like gcc[openmp]" - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + lua-single_pkg_setup } src_prepare() { @@ -64,11 +60,11 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" @@ -97,4 +93,7 @@ src_install() { rmdir "${ED}"/etc/ || die "rmdir failed" mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" rmdir "${ED}"/usr/share/ini || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die }