From 6de060b5d3398eb052b2d6388ce9001e2a31f779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 14 Jul 2020 10:30:42 +0100
Subject: [PATCH] Add meson hint for libgcrypt-config on mingw cross builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://bugzilla.redhat.com/show_bug.cgi?id=1856446

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 mingw-filesystem.spec   | 5 ++++-
 toolchain-mingw32.meson | 1 +
 toolchain-mingw64.meson | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index cf860f5..747e9a8 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        113
+Version:        114
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Tue Jul 14 2020 Daniel P. Berrangé <berrange@redhat.com> - 114-1
+- Add meson hint for libgcrypt-config on mingw cross builds (#1856446)
+
 * Sat May 23 2020 Sandro Mani <manisandro@gmail.com> - 113-1
 - Add %%mingw_make_build and %%mingw_make_install
 
diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson
index edae1d6..4d3000b 100644
--- a/toolchain-mingw32.meson
+++ b/toolchain-mingw32.meson
@@ -9,6 +9,7 @@ ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/i686-w64-mingw32-strip'
 windres = '/usr/bin/i686-w64-mingw32-windres'
 dlltool = '/usr/bin/i686-w64-mingw32-dlltool'
+libgcrypt-config = '/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
 
 [properties]
 root = '/usr/i686-w64-mingw32/sys-root/mingw'
diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson
index 195df84..918bee0 100644
--- a/toolchain-mingw64.meson
+++ b/toolchain-mingw64.meson
@@ -9,6 +9,7 @@ ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/x86_64-w64-mingw32-strip'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'
 dlltool = '/usr/bin/x86_64-w64-mingw32-dlltool'
+libgcrypt-config = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
 
 [properties]
 root = '/usr/x86_64-w64-mingw32/sys-root/mingw'