diff options
| author |   Sam James <sam@gentoo.org> | 2021-03-27 02:29:12 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-03-27 02:57:39 +0000 |
| commit | 611be213548508e78a3c65b64901b28a819fa61b (patch) | |
| tree | b8a78450fe402d6234b3c3208161f1e4155e7c36 /sci-libs | |
| parent | sci-libs/gerris: fix build with slibtool (diff) | |
| download | gentoo-611be213548508e78a3c65b64901b28a819fa61b.tar.gz gentoo-611be213548508e78a3c65b64901b28a819fa61b.tar.bz2 gentoo-611be213548508e78a3c65b64901b28a819fa61b.zip | |
sci-libs/gerris: port to EAPI 7, respect NM
* Port to EAPI 7
* ${EPREFIX} -> ${ESYSROOT} for header location
* Respect NM
Closes: https://bugs.gentoo.org/725450
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/gerris/files/gerris-20131206-respect-NM.patch | 12 | ||||
| -rw-r--r-- | sci-libs/gerris/gerris-20131206-r1.ebuild | 18 |
2 files changed, 23 insertions, 7 deletions
diff --git a/sci-libs/gerris/files/gerris-20131206-respect-NM.patch b/sci-libs/gerris/files/gerris-20131206-respect-NM.patch new file mode 100644 index 000000000000..88d3e5bca87a --- /dev/null +++ b/sci-libs/gerris/files/gerris-20131206-respect-NM.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/725450 +--- a/doc/examples/modulesyms.sh ++++ b/doc/examples/modulesyms.sh +@@ -7,7 +7,7 @@ for module in `cat modules.list`; do + lib=$2/lib"$module""$dim".so + fi + if test -f $lib; then +- nm -fb $lib | grep ".* T gfs_.*_class$" | grep -v "gfs_gl" | cut -d" " -f3-4 ++ ${NM:-nm} -fb $lib | grep ".* T gfs_.*_class$" | grep -v "gfs_gl" | cut -d" " -f3-4 + fi + done + done | sort | uniq | sed -e 's/_class//g' -e 's/^./\U&/' -e 's/_./\U&/g' -e 's/_//g' | \ diff --git a/sci-libs/gerris/gerris-20131206-r1.ebuild b/sci-libs/gerris/gerris-20131206-r1.ebuild index 3ce7e0b36044..cf42447323e6 100644 --- a/sci-libs/gerris/gerris-20131206-r1.ebuild +++ b/sci-libs/gerris/gerris-20131206-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic toolchain-funcs xdg @@ -10,9 +10,9 @@ MY_P=${P/-20/-snapshot-} DESCRIPTION="Gerris Flow Solver" HOMEPAGE="http://gfs.sourceforge.net/" SRC_URI="http://gerris.dalembert.upmc.fr/gerris/tarballs/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" - SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples mpi static-libs" @@ -32,10 +32,8 @@ RDEPEND=" sci-libs/fftw:3.0= virtual/lapack mpi? ( virtual/mpi )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" # buggy tests, need extra packages and require gerris to be installed RESTRICT=test @@ -47,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${PN}-20131206-lis-api-change.patch "${FILESDIR}"/${PN}-20131206-DEFAULT_SOURCE-replacement.patch "${FILESDIR}"/${PN}-20131206-slibtool.patch + "${FILESDIR}"/${PN}-20131206-respect-NM.patch ) src_prepare() { @@ -55,7 +54,11 @@ src_prepare() { } src_configure() { - append-cppflags "-I${EPREFIX}/usr/include/hypre" + # bug #725450 + tc-export NM + + append-cppflags "-I${ESYSROOT}/usr/include/hypre" + econf \ --enable-shared \ $(use_enable static-libs static) \ @@ -65,6 +68,7 @@ src_configure() { src_install() { default + use examples && dodoc -r doc/examples find "${D}" -name '*.la' -delete || die |