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é - 114-1 +- Add meson hint for libgcrypt-config on mingw cross builds (#1856446) + * Sat May 23 2020 Sandro Mani - 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'