https://bugs.gentoo.org/968162 https://gitlab.gnome.org/GNOME/gegl/-/commit/8b609d02a76a59ab39e5901b765c1e197d285112 https://gitlab.gnome.org/GNOME/gegl/-/commit/f8366fd5963b31b31bd02ebd2e97ad2652608046 From 8b609d02a76a59ab39e5901b765c1e197d285112 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Sun, 15 Mar 2026 20:05:50 +0200 Subject: [PATCH 1/2] tools: allow use of NM env variable Bug: https://bugs.gentoo.org/968162 Signed-off-by: Alfred Wingate --- a/meson.build +++ b/meson.build @@ -662,6 +662,8 @@ subdir('docs') if not os_osx and host_cpu_family != 'x86' + nm = find_program('nm', required: false) + # Verify .def files for Windows linking. # We check this on non-Windows platform on CI, and on Windows itself. custom_target('check-def-files', @@ -675,6 +677,7 @@ if not os_osx and host_cpu_family != 'x86' gegl_npd_lib, seamlessclone_lib ], + env: nm.found() ? { 'NM': nm.full_path() } : {}, output: [ 'check-def-files', ], command: [ python, meson.project_source_root() / 'tools' / 'defcheck.py', '@INPUT@', --- a/tools/defcheck.py +++ b/tools/defcheck.py @@ -30,7 +30,7 @@ Needs the tool "nm", "objdump" or "dumpbin" to work import os, sys, subprocess, shutil -from os import path +from os import getenv, path def_files = sys.argv[1:] @@ -56,7 +56,7 @@ ignore_sorting_errors = [ have_errors = 0 libextension = ".so" -command = "nm --defined-only --extern-only " +command = getenv("NM", default="nm") + " --defined-only --extern-only " libprefix = "lib" platform_linux = True -- GitLab From f8366fd5963b31b31bd02ebd2e97ad2652608046 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Sun, 15 Mar 2026 20:07:41 +0200 Subject: [PATCH 2/2] tools: include error message to ease debugging Signed-off-by: Alfred Wingate --- a/tools/defcheck.py +++ b/tools/defcheck.py @@ -100,6 +100,7 @@ for df in def_files: status, nm = subprocess.getstatusoutput (command + libname) if status != 0: print("trouble reading {} - has it been compiled?".format(libname)) + print(nm) have_errors = -1 continue -- GitLab