From ab30f16cc7021f8d9b8446e050fd1e384d282c92 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Tue, 21 Jan 2025 22:35:52 +0000
Subject: meson: Find programs using the native file only, not the cross file

These should all be native programs found on the build machine. We
should not try to execute them via QEMU. Users would therefore expect to
configure them using the native file, not the cross file.

See https://mesonbuild.com/Reference-manual_functions.html#find_program.
---
 meson.build    | 9 +++++++++
 po/meson.build | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index e8f13b71..687b5c2f 100644
--- a/meson.build
+++ b/meson.build
@@ -489,16 +489,19 @@ if enable_docs
   prog_xsltproc = find_program(
     'xsltproc',
     required: feature_docs,
+    native: true,
     disabler: true,
   )
   prog_xmllint = find_program(
     'xmllint',
     required: feature_docs,
+    native: true,
     disabler: true,
   )
   prog_w3m = find_program(
     'w3m',
     required: false,
+    native: true,
   )
   if prog_w3m.found()
     browser = [prog_w3m, '-T', 'text/html', '-dump']
@@ -506,6 +509,7 @@ if enable_docs
     prog_elinks = find_program(
       'elinks',
       required: feature_docs,
+      native: true,
       disabler: true,
     )
     browser = [prog_elinks, '-no-numbering', '-no-references', '-dump']
@@ -513,12 +517,14 @@ if enable_docs
   prog_fop = find_program(
     'fop',
     required: false,
+    native: true,
     disabler: true,
   )
 
   prog_xmlcatalog = find_program(
     'xmlcatalog',
     required: feature_docs,
+    native: true,
     disabler: true,
   )
   xml_catalog = get_option('xml-catalog')
@@ -600,6 +606,7 @@ endif
 prog_flex = find_program(
   'flex',
   required: false,
+  native: true,
   disabler: true,
 )
 
@@ -607,6 +614,7 @@ yacc_cmd = []
 prog_yacc = find_program(
   'bison',
   required: false,
+  native: true,
 )
 if prog_yacc.found()
   yacc_cmd = [prog_yacc, '-o', '@OUTPUT0@', '--defines=@OUTPUT1@', '@INPUT@']
@@ -614,6 +622,7 @@ else
   prog_yacc = find_program(
     'byacc',
     required: false,
+    native: true,
     disabler: true,
   )
   yacc_cmd = [prog_yacc, '-o', '@OUTPUT0@', '-H', '@OUTPUT1@', '@INPUT@']
diff --git a/po/meson.build b/po/meson.build
index bfd0937d..72dd97ad 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,4 +1,4 @@
-if not find_program('gettext', required: get_option('i18n')).found()
+if not find_program('gettext', required: get_option('i18n'), native: true).found()
   subdir_done()
 endif
 
-- 
cgit v1.2.3