PR#6: Add meson hint for libgcrypt-config on mingw cross builds - rpms/mingw-filesystem

Daniel P. Berrangé • 3 years ago

6de060b

mingw-filesystem.spec

file modified

+4 -1

		`@@ -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 @@`


		`%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`

toolchain-mingw32.meson

file modified

		`@@ -9,6 +9,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'`

		`[properties]`
		`root = '/usr/i686-w64-mingw32/sys-root/mingw'`

toolchain-mingw64.meson

file modified

		`@@ -9,6 +9,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'`

		`[properties]`
		`root = '/usr/x86_64-w64-mingw32/sys-root/mingw'`