commit: b6c0bdaf7631904f05ee91049a25e6de00359638 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Mon Nov 17 02:29:56 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 17 07:46:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c0bdaf
sci-geosciences/grass: silence gdal header error This error doesn't appear to be fatal, but it easily misleads those who reads logs. Just fix it properly. Bug: https://bugs.gentoo.org/831600 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44646 Closes: https://github.com/gentoo/gentoo/pull/44646 Signed-off-by: Sam James <sam <AT> gentoo.org> .../grass/files/grass-8.4.1-gdal-include.patch | 30 ++++++++++++++++++++++ sci-geosciences/grass/grass-8.4.1-r1.ebuild | 1 + 2 files changed, 31 insertions(+) diff --git a/sci-geosciences/grass/files/grass-8.4.1-gdal-include.patch b/sci-geosciences/grass/files/grass-8.4.1-gdal-include.patch new file mode 100644 index 000000000000..cc75f4cd4b97 --- /dev/null +++ b/sci-geosciences/grass/files/grass-8.4.1-gdal-include.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/831600 +https://github.com/OSGeo/grass/issues/4258 +https://github.com/OSGeo/grass/pull/6631 + +From 06ccd10965b6fbc7f7fd0675bf01fe881619f075 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <[email protected]> +Date: Mon, 17 Nov 2025 04:13:58 +0200 +Subject: [PATCH] make: pass GDAL include dirs to proj + +vector_inc and vedit_inc don't need this treatment as VECT_CFLAGS has it +added already. This would conform to how its done in the CMakeLists.txt +as well. + +Oddly enough this isn't a fatal error though. So if anyone hit a build +failure and thought this was the issue should look further into their +builds logs for the actual cause. + +Bug: https://github.com/OSGeo/grass/issues/4258 +Signed-off-by: Alfred Wingate <[email protected]> +--- a/python/libgrass_interface_generator/Makefile ++++ b/python/libgrass_interface_generator/Makefile +@@ -52,7 +52,7 @@ segment_HDRS = segment.h defs/segment.h + rowio_HDRS = rowio.h defs/rowio.h + temporal_HDRS = temporal.h + +-proj_INC = $(PROJINC) ++proj_INC = $(PROJINC) $(GDALCFLAGS) + vector_INC = $(VECT_INC) $(VECT_CFLAGS) + vedit_INC = $(VECT_INC) $(VECT_CFLAGS) + diff --git a/sci-geosciences/grass/grass-8.4.1-r1.ebuild b/sci-geosciences/grass/grass-8.4.1-r1.ebuild index a43de3e6c360..89e5c366be5b 100644 --- a/sci-geosciences/grass/grass-8.4.1-r1.ebuild +++ b/sci-geosciences/grass/grass-8.4.1-r1.ebuild @@ -104,6 +104,7 @@ BDEPEND=" PATCHES=( # bug 746590 "${FILESDIR}/${PN}-flock.patch" + "${FILESDIR}"/grass-8.4.1-gdal-include.patch ) pkg_pretend() {
