diff options
Diffstat (limited to 'sci-libs/gerris')
| -rw-r--r-- | sci-libs/gerris/Manifest | 4 | ||||
| -rw-r--r-- | sci-libs/gerris/files/gerris-20131206-respect-NM.patch | 12 | ||||
| -rw-r--r-- | sci-libs/gerris/files/gerris-20131206-slibtool.patch | 119 | ||||
| -rw-r--r-- | sci-libs/gerris/gerris-20131206-r1.ebuild | 21 |
4 files changed, 147 insertions, 9 deletions
diff --git a/sci-libs/gerris/Manifest b/sci-libs/gerris/Manifest index dc3800c4595a..c397ee431fb9 100644 --- a/sci-libs/gerris/Manifest +++ b/sci-libs/gerris/Manifest @@ -3,6 +3,8 @@ AUX gerris-20130531-lis-matrix-csr.patch 265 BLAKE2B d49cb13aacbae0d45092f09e10e AUX gerris-20130531-use-blas-lapack-system.patch 1466 BLAKE2B a3c451570d97227008a9540509155ad616ce392bf307a5f3d24124aa50e21fb95cd7ac22d788aad0ddd8597c45c50f700c4b5a5978756e884621e2a9b65145ad SHA512 4ff7f35c1d8698cc6ce2ed31708e0d05fd1cd6c8829d2ab7cc589fb5e4e1ea080df27587a7bf59ec7303c0dcfaa159da625a330a5eb5d1901ecfa45a762d41e4 AUX gerris-20131206-DEFAULT_SOURCE-replacement.patch 728 BLAKE2B c2c6e05692d200d308dd7cd51896a06270b32e768b2e84b535858390972344998b1f64ff1c4a752211b97473064999b0737a9d4de03a1ba0ef5536af62ea511d SHA512 b1ca792b4b9ffe88964f58e12a3caff23ec3ba31f8f43136acf9adc106c57d10f75f32d2ec7a6769cdd130324e9de9a1621fc4c90be834eef330690f765159c7 AUX gerris-20131206-lis-api-change.patch 526 BLAKE2B fedac0aa8cf763b37dd68c03f321e8ebe91caf944c51366ab3c8a1f0474eb140095af4207c208c8c9ed99bfb42a025e4437ad42da5e64cdf4986944910c3f1b6 SHA512 bba5cc317e66cbd48e80e2a1ce6cbd1f3688f77e3433c846294c56ba39591a840c2577eaffeed05553f651dc749ceaf751c2451624b71812ea2238014f456b25 +AUX gerris-20131206-respect-NM.patch 492 BLAKE2B 5c6e09a46383ac509ab5051cb5ad22c9dc047bd9c61b2dde329e6e08d171989a5b0eb21a660c6780d02ed6daea9b4ce04cfc88736e0e31c89fce9dc8420f10f8 SHA512 80989517724660605c96096881281b9b6baa1e3bfcc2207779b81b3aa582dad21fba301c96897737416dec335e74b8b47fb35813862092807e3d8fc59937927f +AUX gerris-20131206-slibtool.patch 4424 BLAKE2B e81f8c85c9af29b6f423835809cf24829bf58268f6dce174fe93db35d56e14a5fd6dfc9b19884e5c0dab9e311b35b0fb4669b9218b8b746a4f9b3661f8993eb8 SHA512 70c89d00a8b317da4b83ea8399fa64ea86f68aaa613538fa9b17198107535a7c55fce58bff3780ebe002543f2e153c743e7f70e70f703ed22158d402adc10319 DIST gerris-snapshot-131206.tar.gz 2841686 BLAKE2B 63618b2166e632e447f7a47dd17f2bab1820234b9a651c4fcad57250b13bbfdf98645c9525d4cebcae6ab9ef81d111fadbff9800e3144d84bf59f2248e271585 SHA512 b3855d51eea04c496d2e5f662c148560d9ab8d5dfa97e4f7d1c22c70405b9b801b46f30aa0d159b1bd6a8182f171a1649b5f510f0e13feeb55f29cafe57b45dd -EBUILD gerris-20131206-r1.ebuild 1558 BLAKE2B 6eb4b017e887b067f14396f250d14d564da9dd93d3164837f5d7899ebacdd5116c231d22680d9485e9b4b21de7ce42738b258410b5778229b987be70e0763669 SHA512 d05592d019f0cc00bcc7eafca126be972990fa48d33cf19e5becd61948604bbd1bd1fcf05c91ba32afaec59009660541f14485de75b367ca96c7f39b88c08e55 +EBUILD gerris-20131206-r1.ebuild 1690 BLAKE2B 918c19b3e9dc7bbbe43edaabc9766cccfe50f22f7f19fef728909a817292365275c8619b8064eda22588ec839148e44cf7716418337758e3398013ee71a4b204 SHA512 48da318a751bb571ec8d7807dea4f21c001ce399bd4f1c01a676ebebcc8fbee873bff966b3ef5de0cdd577324edad487809b3250ba2c266e869bdb6afdf5f242 MISC metadata.xml 510 BLAKE2B 24ec4c7f0735f04eb58a6382166c3552d329b7b51b1ac4b3ab4522603583c96197d4ddd5081b056b27c50cf13f5814a20cdb8f0716d7b8af8fb276f17d81916b SHA512 876a9ba57d32d3bcb0071d8644a6d050ef67df1a94b90064bd7f7e45ddf44c3efa220c1c9738279892f2c8327da26043c29f8478cfb5599e3e3eda43d99719e8 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/files/gerris-20131206-slibtool.patch b/sci-libs/gerris/files/gerris-20131206-slibtool.patch new file mode 100644 index 000000000000..d28501d2869b --- /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 4ddca5bec04a..cf42447323e6 100644 --- a/sci-libs/gerris/gerris-20131206-r1.ebuild +++ b/sci-libs/gerris/gerris-20131206-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# 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 @@ -46,6 +44,8 @@ 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 + "${FILESDIR}"/${PN}-20131206-respect-NM.patch ) src_prepare() { @@ -54,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) \ @@ -64,6 +68,7 @@ src_configure() { src_install() { default + use examples && dodoc -r doc/examples find "${D}" -name '*.la' -delete || die |