commit: b20e4256ca04968bc0a8708797e49459bf950ac6 Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> AuthorDate: Sat Mar 7 04:16:15 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 11 05:16:05 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20e4256
media-gfx/gimp: -native-symlinks fix without NM/READLINK in make.conf Tested in an environment without the ~workaround of CC/CXX/NM/READLINK/… set in make.conf Bug: https://bugs.gentoo.org/968162 Fixes: ca7b3a0b88dadc613d6c1547aeb2b6a79d9a515c Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> Part-of: https://codeberg.org/gentoo/gentoo/pulls/236 Merges: https://codeberg.org/gentoo/gentoo/pulls/236 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch | 22 ++++++++++++++++++++++ media-gfx/gimp/gimp-3.2.0_rc2.ebuild | 2 ++ media-gfx/gimp/gimp-3.2.0_rc3.ebuild | 6 ++++++ 3 files changed, 30 insertions(+) diff --git a/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch b/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch new file mode 100644 index 000000000000..08f308a236c3 --- /dev/null +++ b/media-gfx/gimp/files/gimp-3.2.0-respect-NM.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/968162 + +--- a/tools/defcheck.py ++++ b/tools/defcheck.py +@@ -31,7 +31,7 @@ + + import os, sys, subprocess + +-from os import path ++from os import getenv, path + + def_files = ( + "libgimpbase/gimpbase.def", +@@ -55,7 +55,7 @@ + sys.exit (-1) + + libextension = ".so" +-command = "nm --defined-only --extern-only " ++command = getenv("NM", default="nm") + " --defined-only --extern-only " + platform_linux = True + + if sys.platform in ['win32', 'cygwin']: diff --git a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild index 75f6e244bfe2..8c72c9a3ccde 100644 --- a/media-gfx/gimp/gimp-3.2.0_rc2.ebuild +++ b/media-gfx/gimp/gimp-3.2.0_rc2.ebuild @@ -202,6 +202,8 @@ src_configure() { use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + tc-export NM READELF + use vala && vala_setup local emesonargs=( diff --git a/media-gfx/gimp/gimp-3.2.0_rc3.ebuild b/media-gfx/gimp/gimp-3.2.0_rc3.ebuild index 23fcbb037ed0..204fac3fc411 100644 --- a/media-gfx/gimp/gimp-3.2.0_rc3.ebuild +++ b/media-gfx/gimp/gimp-3.2.0_rc3.ebuild @@ -156,6 +156,10 @@ BDEPEND=" DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" ) +PATCHES=( + "${FILESDIR}"/gimp-3.2.0-respect-NM.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -215,6 +219,8 @@ src_configure() { use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND use X || append-cppflags -DGENTOO_GTK_HIDE_X11 + tc-export NM READELF + use vala && vala_setup local emesonargs=(
