commit: 6411adf2ffd54418b72fd304b8cbf9ae28321293 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Apr 15 07:11:06 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Apr 15 07:12:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6411adf2
dev-util/mingw64-runtime: fix build w/ USE=libraries Closes: https://bugs.gentoo.org/787662 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/mingw64-runtime-8.0.0-udivmod.patch | 26 ++++++++++++++++++++++ .../mingw64-runtime-8.0.0-r1.ebuild | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch new file mode 100644 index 000000000000..dcbe99878f05 --- /dev/null +++ b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/787662 +https://sourceforge.net/p/mingw-w64/mingw-w64/ci/ab0fa5ad3c67d634fd7754d9473d1bb7051f9bf0/tree/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c?diff=6a0e9165008f731bccadfc41a59719cf7c8efc02 +--- a/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c ++++ b/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c +@@ -121,6 +121,7 @@ + u_quad_t __umoddi3(u_quad_t a, u_quad_t b); + int __ucmpdi2(u_quad_t a, u_quad_t b); + quad_t __divmoddi4(quad_t a, quad_t b, quad_t *rem); ++u_quad_t __udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem); + + #endif /* !_LIBKERN_QUAD_H_ */ + +@@ -573,6 +574,12 @@ + return (negq ? -uq : uq); + } + ++u_quad_t ++__udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem) ++{ ++ return __qdivrem(a, b, rem); ++} ++ + #else + static int __attribute__((unused)) dummy; + #endif /*deined (_X86_) && !defined (__x86_64__)*/ + diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild index 3dfff3894bf5..66146673f8ce 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,6 +29,7 @@ S="${WORKDIR}/mingw-w64-v${PV}" PATCHES=( "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch "${FILESDIR}"/${PN}-8.0.0-__rdtsc.patch + "${FILESDIR}"/${PN}-8.0.0-udivmod.patch ) is_crosscompile() {
