* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gerris/files/, sci-libs/gerris/
@ 2021-03-27 2:58 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-03-27 2:58 UTC (permalink / raw
To: gentoo-commits
commit: 08b0488189721a4b2904e41b5e705b9ef86e4f8d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 02:18:01 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 02:57:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08b04881
sci-libs/gerris: fix build with slibtool
Thanks-to: orbea <orbea <AT> riseup.net>
Closes: https://bugs.gentoo.org/778341
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gerris/files/gerris-20131206-slibtool.patch | 119 +++++++++++++++++++++
sci-libs/gerris/gerris-20131206-r1.ebuild | 3 +-
2 files changed, 121 insertions(+), 1 deletion(-)
diff --git a/sci-libs/gerris/files/gerris-20131206-slibtool.patch b/sci-libs/gerris/files/gerris-20131206-slibtool.patch
new file mode 100644
index 00000000000..d28501d2869
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-20131206-slibtool.patch
@@ -0,0 +1,119 @@
+https://bugs.gentoo.org/778341
+
+commit 9213297c1717f6477c4784ead6c91864693e6b40
+Author: orbea <orbea@riseup.net>
+Date: Fri Mar 26 15:56:31 2021 -0700
+
+ Link the .la files to fix the build with slibtool.
+
+diff --git a/modules/Makefile.am b/modules/Makefile.am
+index c66aea0..d6db7b6 100644
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
+@@ -78,24 +78,21 @@ libmap2D_la_SOURCES = map.c
+ libmap2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+ libmap2D_la_LIBADD = $(GFS2D_LIBS) -lproj
+
+-KDTLIBS = -Lkdt -lkdt -lm
+-KDTDEPS = kdt/libkdt.la
++KDTLIBS = kdt/libkdt.la -lm
+
+ libterrain3D_la_SOURCES = terrain.c
+ libterrain3D_la_LIBADD = $(GFS3D_LIBS) $(KDTLIBS)
+-libterrain3D_la_DEPENDENCIES = $(KDTDEPS)
+
+ libterrain2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+ libterrain2D_la_SOURCES = terrain.c
+ libterrain2D_la_LIBADD = $(GFS2D_LIBS) $(KDTLIBS)
+-libterrain2D_la_DEPENDENCIES = $(KDTDEPS)
+
+ libtide3D_la_SOURCES = tide.c
+ libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
+-libtide3D_la_LIBADD = $(GFS3D_LIBS) -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
++libtide3D_la_LIBADD = $(GFS3D_LIBS) fes2004/libfes.la -lnetcdf $(GSL_LIBS)
+ libtide2D_la_SOURCES = tide.c
+ libtide2D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D=1
+-libtide2D_la_LIBADD = $(GFS2D_LIBS) -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
++libtide2D_la_LIBADD = $(GFS2D_LIBS) fes2004/libfes.la -lnetcdf $(GSL_LIBS)
+
+ libstokes3D_la_SOURCES = stokes.c CW263.f
+ libstokes3D_la_CFLAGS = $(AM_CFLAGS)
+@@ -105,7 +102,7 @@ libstokes2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+ libstokes2D_la_LIBADD = $(GFS2D_LIBS)
+
+ libwavewatch2D_la_SOURCES = wavewatch.c
+-libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) -Lwavewatch -lwavewatch
++libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) wavewatch/libwavewatch.la
+ libwavewatch2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 \
+ -DW3SRCE=`nm wavewatch/libwavewatch.a | grep w3srce | awk '{ if ($$2 == "T") print $$3; }'` \
+ -DGFSW3INIT=`nm wavewatch/libwavewatch.a | grep gfsw3_init | awk '{ if ($$2 == "T") print $$3; }'`
+@@ -119,9 +116,9 @@ libode2D_la_CFLAGS = $(AM_CFLAGS) $(ODE_CFLAGS) -DFTT_2D=1
+ libode2D_la_LIBADD = $(GFS2D_LIBS) $(ODE_LIBS)
+
+ rsurface2kdt_SOURCES = rsurface2kdt.c rsurface.c rsurface.h
+-rsurface2kdt_LDADD = -LRStarTree -lcSmRST $(KDTLIBS)
++rsurface2kdt_LDFLAGS = $(NO_UNDEFINED)
++rsurface2kdt_LDADD = RStarTree/libcSmRST.la $(KDTLIBS)
+ rsurface2kdt_CFLAGS = $(AM_CFLAGS)
+-rsurface2kdt_DEPENDENCIES = $(KDTDEPS)
+
+ noinst_LTLIBRARIES = libparticulatecommon2D.la libparticulatecommon3D.la
+
+@@ -210,7 +207,7 @@ libtopics2D_la_LIBADD = $(GFS2D_LIBS)
+
+ libculvert2D_la_SOURCES = culvert.c
+ libculvert2D_la_CFLAGS = $(AM_CFLAGS)
+-libculvert2D_la_LIBADD = $(GFS2D_LIBS) -Lculvert -lboyd87 -lm
++libculvert2D_la_LIBADD = $(GFS2D_LIBS) culvert/libboyd87.la -lm
+ libculvert2D_la_DEPENDENCIES = culvert/libboyd87.la
+
+ liblayered2D_la_SOURCES = layered.c
+diff --git a/modules/culvert/Makefile.am b/modules/culvert/Makefile.am
+index dff5b46..cb47591 100644
+--- a/modules/culvert/Makefile.am
++++ b/modules/culvert/Makefile.am
+@@ -8,17 +8,17 @@ libboyd87_la_SOURCES = boyd87.c boyd87.h
+ noinst_PROGRAMS = check_inlet check_outlet discharge_table
+
+ check_outlet_SOURCES = check_outlet.c boyd87.h
+-check_outlet_LDADD = -lboyd87 -lm
++check_outlet_LDADD = libboyd87.la -lm
+ check_outlet_CFLAGS = $(AM_CFLAGS)
+ check_outlet_DEPENDENCIES = libboyd87.la
+
+ check_inlet_SOURCES = check_inlet.c boyd87.h
+-check_inlet_LDADD = -lboyd87 -lm
++check_inlet_LDADD = libboyd87.la -lm
+ check_inlet_CFLAGS = $(AM_CFLAGS)
+ check_inlet_DEPENDENCIES = libboyd87.la
+
+ discharge_table_SOURCES = discharge_table.c boyd87.h
+-discharge_table_LDADD = -lboyd87 -lm
++discharge_table_LDADD = libboyd87.la -lm
+ discharge_table_CFLAGS = $(AM_CFLAGS)
+ discharge_table_DEPENDENCIES = libboyd87.la
+
+diff --git a/modules/kdt/Makefile.am b/modules/kdt/Makefile.am
+index a9e7954..376e7dd 100644
+--- a/modules/kdt/Makefile.am
++++ b/modules/kdt/Makefile.am
+@@ -13,16 +13,16 @@ libkdt_la_SOURCES = \
+ kdt.h
+
+ xyz2kdt_SOURCES = xyz2kdt.c kdt.h
+-xyz2kdt_LDADD = -lkdt -lm
++xyz2kdt_LDADD = libkdt.la -lm
+ xyz2kdt_CFLAGS = $(AM_CFLAGS)
+ xyz2kdt_DEPENDENCIES = libkdt.la
+
+ kdt2kdt_SOURCES = kdt2kdt.c kdt.h
+-kdt2kdt_LDADD = -lkdt -lm
++kdt2kdt_LDADD = libkdt.la -lm
+ kdt2kdt_CFLAGS = $(AM_CFLAGS)
+ kdt2kdt_DEPENDENCIES = libkdt.la
+
+ kdtquery_SOURCES = kdtquery.c kdt.h
+-kdtquery_LDADD = -lkdt -lm
++kdtquery_LDADD = libkdt.la -lm
+ kdtquery_CFLAGS = $(AM_CFLAGS)
+ kdtquery_DEPENDENCIES = libkdt.la
diff --git a/sci-libs/gerris/gerris-20131206-r1.ebuild b/sci-libs/gerris/gerris-20131206-r1.ebuild
index 4ddca5bec04..3ce7e0b3604 100644
--- a/sci-libs/gerris/gerris-20131206-r1.ebuild
+++ b/sci-libs/gerris/gerris-20131206-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-20130531-use-blas-lapack-system.patch
"${FILESDIR}"/${PN}-20131206-lis-api-change.patch
"${FILESDIR}"/${PN}-20131206-DEFAULT_SOURCE-replacement.patch
+ "${FILESDIR}"/${PN}-20131206-slibtool.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/gerris/files/, sci-libs/gerris/
@ 2021-03-27 2:58 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-03-27 2:58 UTC (permalink / raw
To: gentoo-commits
commit: 611be213548508e78a3c65b64901b28a819fa61b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 02:29:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 02:57:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611be213
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 <AT> gentoo.org>
sci-libs/gerris/files/gerris-20131206-respect-NM.patch | 12 ++++++++++++
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 00000000000..88d3e5bca87
--- /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 3ce7e0b3604..cf42447323e 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-27 2:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-27 2:58 [gentoo-commits] repo/gentoo:master commit in: sci-libs/gerris/files/, sci-libs/gerris/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-03-27 2:58 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox