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 77E3E139368 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 93FFDE0942; Wed, 4 Aug 2021 17:40:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 64353E0942 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 03E0A342B75 for ; Wed, 4 Aug 2021 17:40:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B6C3857 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: <1628098840.c766e3af48c962e8fd2762b5f60ff848f398fc3d.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/p4est/p4est-2.3.1-r1.ebuild sci-libs/p4est/p4est-2.3.1.ebuild sci-libs/p4est/p4est-9999.ebuild X-VCS-Directories: sci-libs/p4est/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: c766e3af48c962e8fd2762b5f60ff848f398fc3d 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: b9a7e195-5e90-4497-a783-c5ffedd9cc5a X-Archives-Hash: 684918ec9d3080a64b155cdcdb8786e2 commit: c766e3af48c962e8fd2762b5f60ff848f398fc3d Author: David Seifert gentoo org> AuthorDate: Wed Aug 4 17:40:40 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Aug 4 17:40:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c766e3af sci-libs/p4est: remove USE=static-libs Signed-off-by: David Seifert gentoo.org> .../{p4est-2.3.1.ebuild => p4est-2.3.1-r1.ebuild} | 34 +++++++++--------- sci-libs/p4est/p4est-9999.ebuild | 40 ++++++++++++---------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/sci-libs/p4est/p4est-2.3.1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild similarity index 83% rename from sci-libs/p4est/p4est-2.3.1.ebuild rename to sci-libs/p4est/p4est-2.3.1-r1.ebuild index 597b67a136a..c7756fee11c 100644 --- a/sci-libs/p4est/p4est-2.3.1.ebuild +++ b/sci-libs/p4est/p4est-2.3.1-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} ) -inherit autotools lua-single toolchain-funcs +inherit autotools flag-o-matic lua-single toolchain-funcs DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" HOMEPAGE="http://www.p4est.org/" @@ -26,34 +26,31 @@ LICENSE="GPL-2+" SLOT="0" # TODO petsc -IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary" +IUSE="debug doc examples mpi openmp romio threads +vtk-binary" REQUIRED_USE="${LUA_REQUIRED_USE} romio? ( mpi )" RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=] + ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )" - -DEPEND=" - ${RDEPEND} - sys-devel/automake - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch "${FILESDIR}"/${PN}-2.3-add_soname.patch ) -DOCS=( AUTHORS NEWS README ) - 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() { @@ -82,19 +79,19 @@ src_prepare() { src_configure() { # avoid underlinkage - LDFLAGS="${LDFLAGS} -lsc" + append-libs -lsc local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) $(use_enable vtk-binary) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${EPREFIX}/usr" + --with-sc="${ESYSROOT}/usr" ) econf "${myeconfargs[@]}" } @@ -119,4 +116,7 @@ src_install() { mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" rmdir "${ED}"/etc/ || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild index bb4b3a864ed..c7756fee11c 100644 --- a/sci-libs/p4est/p4est-9999.ebuild +++ b/sci-libs/p4est/p4est-9999.ebuild @@ -5,10 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} ) -# The build system currently fails with everything newer than 1.11. -WANT_AUTOMAKE=1.11 - -inherit autotools lua-single toolchain-funcs +inherit autotools flag-o-matic lua-single toolchain-funcs DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" HOMEPAGE="http://www.p4est.org/" @@ -29,29 +26,31 @@ LICENSE="GPL-2+" SLOT="0" # TODO petsc -IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary" +IUSE="debug doc examples mpi openmp romio threads +vtk-binary" REQUIRED_USE="${LUA_REQUIRED_USE} romio? ( mpi )" RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=] + ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -DEPEND=" - ${RDEPEND} - sys-devel/automake:1.11 - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS README ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch + "${FILESDIR}"/${PN}-2.3-add_soname.patch +) 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() { @@ -80,19 +79,19 @@ src_prepare() { src_configure() { # avoid underlinkage - LDFLAGS="${LDFLAGS} -lsc" + append-libs -lsc local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) $(use_enable vtk-binary) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${EPREFIX}/usr" + --with-sc="${ESYSROOT}/usr" ) econf "${myeconfargs[@]}" } @@ -117,4 +116,7 @@ src_install() { mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" rmdir "${ED}"/etc/ || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die }