|
 |
7ac0e5 |
From c0d0aa99062d0084c2c24ebd16fd59ce1819277b Mon Sep 17 00:00:00 2001
|
|
|
7ac0e5 |
From: Konstantin Kostiuk <kkostiuk@redhat.com>
|
|
|
7ac0e5 |
Date: Thu, 28 Apr 2022 16:37:38 +0000
|
|
|
7ac0e5 |
Subject: [PATCH 1/2] configure: Add cross prefix for widl tool
|
|
|
7ac0e5 |
|
|
|
7ac0e5 |
The mingw-w64-tool package in Fedora provides widl tool with a
|
|
|
7ac0e5 |
cross prefix, so adds it automatically for cross builds.
|
|
|
7ac0e5 |
|
|
|
7ac0e5 |
WIDL env can be used to redefine the path to tool.
|
|
|
7ac0e5 |
The same behavior as with windres.
|
|
|
7ac0e5 |
|
|
|
7ac0e5 |
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
|
|
|
7ac0e5 |
---
|
|
|
7ac0e5 |
configure | 3 +++
|
|
|
7ac0e5 |
1 file changed, 3 insertions(+)
|
|
|
7ac0e5 |
|
|
|
7ac0e5 |
diff --git a/configure b/configure
|
|
|
7ac0e5 |
index 59c43bea05..8b775492d0 100755
|
|
|
7ac0e5 |
--- a/configure
|
|
|
7ac0e5 |
+++ b/configure
|
|
|
7ac0e5 |
@@ -415,6 +415,7 @@ ranlib="${RANLIB-${cross_prefix}ranlib}"
|
|
|
7ac0e5 |
nm="${NM-${cross_prefix}nm}"
|
|
|
7ac0e5 |
smbd="$SMBD"
|
|
|
7ac0e5 |
strip="${STRIP-${cross_prefix}strip}"
|
|
|
7ac0e5 |
+widl="${WIDL-${cross_prefix}widl}"
|
|
|
7ac0e5 |
windres="${WINDRES-${cross_prefix}windres}"
|
|
|
7ac0e5 |
pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
|
|
|
7ac0e5 |
query_pkg_config() {
|
|
|
7ac0e5 |
@@ -2786,6 +2787,7 @@ if test "$skip_meson" = no; then
|
|
|
7ac0e5 |
echo "sdl2-config = [$(meson_quote $sdl2_config)]" >> $cross
|
|
|
7ac0e5 |
fi
|
|
|
7ac0e5 |
echo "strip = [$(meson_quote $strip)]" >> $cross
|
|
|
7ac0e5 |
+ echo "widl = [$(meson_quote $widl)]" >> $cross
|
|
|
7ac0e5 |
echo "windres = [$(meson_quote $windres)]" >> $cross
|
|
|
7ac0e5 |
if test "$cross_compile" = "yes"; then
|
|
|
7ac0e5 |
cross_arg="--cross-file config-meson.cross"
|
|
|
7ac0e5 |
@@ -2907,6 +2909,7 @@ preserve_env PYTHON
|
|
|
7ac0e5 |
preserve_env SDL2_CONFIG
|
|
|
7ac0e5 |
preserve_env SMBD
|
|
|
7ac0e5 |
preserve_env STRIP
|
|
|
7ac0e5 |
+preserve_env WIDL
|
|
|
7ac0e5 |
preserve_env WINDRES
|
|
|
7ac0e5 |
|
|
|
7ac0e5 |
printf "exec" >>config.status
|
|
|
7ac0e5 |
--
|
|
|
7ac0e5 |
2.25.1
|