diff mbox series

[meta-mingw] nativesdk-mingw-w64-runtime: Fix build error/warning -Wincompatible-pointer-types

Message ID 20240130171030.2154086-1-raj.khem@gmail.com
State New
Headers show
Series [meta-mingw] nativesdk-mingw-w64-runtime: Fix build error/warning -Wincompatible-pointer-types | expand

Commit Message

Khem Raj Jan. 30, 2024, 5:10 p.m. UTC 
This pops up with gcc trunk

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...in-the-ucrt-__imp_vfscanf-assignment.patch | 30 +++++++++++++++++++
 .../nativesdk-mingw-w64-runtime_9.0.0.bb      |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch
diff mbox series

Patch

diff --git a/recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch b/recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch
new file mode 100644
index 0000000..bc41482
--- /dev/null
+++ b/recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch
@@ -0,0 +1,30 @@ 
+From b0dcc496228373417e4f6134beb2f13ca3ed807e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+Date: Thu, 5 Aug 2021 11:08:39 +0300
+Subject: [PATCH] crt: Fix a typo in the ucrt __imp_vfscanf assignment
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The wrong function was assigned; this was a bug present since
+0dd9563a3ad71ad75cab1699ba5cfef2dd0bf9d8 (April 2021).
+
+Upstream-Status: Backport [https://sourceforge.net/p/mingw-w64/mingw-w64/ci/b0dcc496228373417e4f6134beb2f13ca3ed807e]
+Signed-off-by: Martin Storsjö <martin@martin.st>
+---
+ mingw-w64-crt/stdio/ucrt_vfscanf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mingw-w64-crt/stdio/ucrt_vfscanf.c b/mingw-w64-crt/stdio/ucrt_vfscanf.c
+index fe44cdf71..8d1a76a8b 100644
+--- a/mingw-w64-crt/stdio/ucrt_vfscanf.c
++++ b/mingw-w64-crt/stdio/ucrt_vfscanf.c
+@@ -11,4 +11,4 @@
+ int __cdecl vfscanf (FILE *__stream,  const char *__format, __builtin_va_list __local_argv) {
+   return __stdio_common_vfscanf(0, __stream, __format, NULL, __local_argv);
+ }
+-int __cdecl (*__MINGW_IMP_SYMBOL(vfscanf))(FILE *, const char *, __builtin_va_list) = vsscanf;
++int __cdecl (*__MINGW_IMP_SYMBOL(vfscanf))(FILE *, const char *, __builtin_va_list) = vfscanf;
+-- 
+2.43.0
+
diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb
index e2ca6a5..1aa470e 100644
--- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb
+++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb
@@ -2,6 +2,8 @@  DESCRIPTION = "Runtime libraries from MinGW-w64 project"
 
 require mingw-w64.inc
 
+SRC_URI += "file://0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch;striplevel=2"
+
 S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-crt"
 B = "${WORKDIR}/build-${TARGET_SYS}"