From 7be59393305bc86bfb1251f34a06a57a5ac0a6aa Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: May 09 2022 07:49:32 +0000 Subject: Include glib-mkenums in the toolchain binaries --- diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 5455cb7..c1ea4a2 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: 136 +Version: 137 Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment @@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Mon May 09 2022 Richard Hughes 137-1 +- Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building. + * Tue May 03 2022 Sandro Mani - 136-1 - Drop standard DLL provides, moved to mingw-crt diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson index 99fe91a..563565c 100644 --- a/toolchain-mingw32.meson +++ b/toolchain-mingw32.meson @@ -10,6 +10,7 @@ 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' +glib-mkenums = '/usr/i686-w64-mingw32/sys-root/mingw/bin/glib-mkenums' [properties] root = '/usr/i686-w64-mingw32/sys-root/mingw' diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson index 2f633aa..01d83ee 100644 --- a/toolchain-mingw64.meson +++ b/toolchain-mingw64.meson @@ -10,6 +10,7 @@ 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' +glib-mkenums = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/glib-mkenums' [properties] root = '/usr/x86_64-w64-mingw32/sys-root/mingw'