From e51b84e77b30414ee135d7b89eab6c9e681e22e0 Mon Sep 17 00:00:00 2001
From: Rupert <r.weberhenschel@gmail.com>
Date: Mon, 13 Jan 2025 16:46:17 +0100
Subject: [PATCH] Issue #12717: file-bmp plugin broke cross-build with
 generated source

- build 'generate-huffman' natively when cross-building
- also reenable build of file-bmp for cross-builds
---
 plug-ins/file-bmp/meson.build | 3 ++-
 plug-ins/meson.build          | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plug-ins/file-bmp/meson.build b/plug-ins/file-bmp/meson.build
index 8af34e9d30..80e5ae11bb 100644
--- a/plug-ins/file-bmp/meson.build
+++ b/plug-ins/file-bmp/meson.build
@@ -1,7 +1,8 @@
 plugin_name = 'file-bmp'
 
 gen_huffman = executable('generate-huffman',
-                         'generate-huffman.c'
+                         'generate-huffman.c',
+                         native: true
 )
 
 huffman = custom_target('huffman.h',
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index 1b1cc154d6..e1c6ad8afd 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -1,4 +1,5 @@
 subdir('common')
+subdir('file-bmp')
 subdir('file-dds')
 subdir('file-exr')
 subdir('file-faxg3')
@@ -31,7 +32,3 @@ subdir('screenshot')
 subdir('script-fu')
 subdir('selection-to-path')
 subdir('twain')
-
-if not meson.is_cross_build()
-  subdir('file-bmp')
-endif