From 8c6eabc762f13d7ae5d1c22a70e306550cb8616d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 May 2024 22:10:57 -0700 Subject: mingw-w64: Upgrade to 12.0.0 release Drop GCC-14 related backport, its not needed anymore Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...typo-in-the-ucrt-__imp_vfscanf-assignment.patch | 30 --------------------- recipes-devtools/mingw-w64/mingw-w64.inc | 3 +-- .../nativesdk-mingw-w64-headers_12.0.0.bb | 26 ++++++++++++++++++ .../mingw-w64/nativesdk-mingw-w64-headers_9.0.0.bb | 26 ------------------ .../nativesdk-mingw-w64-runtime_12.0.0.bb | 31 ++++++++++++++++++++++ .../mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb | 31 ---------------------- .../nativesdk-mingw-w64-winpthreads_12.0.0.bb | 22 +++++++++++++++ .../nativesdk-mingw-w64-winpthreads_9.0.0.bb | 22 --------------- 8 files changed, 80 insertions(+), 111 deletions(-) delete mode 100644 recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_12.0.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_9.0.0.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_12.0.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_12.0.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_9.0.0.bb 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 deleted file mode 100644 index bc41482..0000000 --- a/recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b0dcc496228373417e4f6134beb2f13ca3ed807e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -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ö ---- - 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/mingw-w64.inc b/recipes-devtools/mingw-w64/mingw-w64.inc index ce5d0db..97315f4 100644 --- a/recipes-devtools/mingw-w64/mingw-w64.inc +++ b/recipes-devtools/mingw-w64/mingw-w64.inc @@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/mingw-w64-v${PV}/COPYING;md5=bb936f0e04d8f COMPATIBLE_HOST = ".*-mingw.*" SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" - -SRC_URI[sha256sum] = "1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181" +SRC_URI[sha256sum] = "cc41898aac4b6e8dd5cffd7331b9d9515b912df4420a3a612b5ea2955bbeed2f" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/" UPSTREAM_CHECK_REGEX = "mingw-w64-v(?P(\d+[\.\-_]*)+)\.tar" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_12.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_12.0.0.bb new file mode 100644 index 0000000..68e77fa --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_12.0.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Header files from the MingGW-w64 project" + +require mingw-w64.inc + +S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-headers" +B = "${WORKDIR}/build-${TARGET_SYS}" + +inherit autotools nativesdk + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "" + +do_configure() { + oe_runconf +} + +do_compile() { + : +} + +do_install:append() { + # install correct pthread headers + install -m 0644 -t ${D}${includedir} ${S}/../mingw-w64-libraries/winpthreads/include/*.h +} + +FILES:${PN} += "${exec_prefix}/${TARGET_SYS}" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_9.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_9.0.0.bb deleted file mode 100644 index 68e77fa..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_9.0.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Header files from the MingGW-w64 project" - -require mingw-w64.inc - -S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-headers" -B = "${WORKDIR}/build-${TARGET_SYS}" - -inherit autotools nativesdk - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "" - -do_configure() { - oe_runconf -} - -do_compile() { - : -} - -do_install:append() { - # install correct pthread headers - install -m 0644 -t ${D}${includedir} ${S}/../mingw-w64-libraries/winpthreads/include/*.h -} - -FILES:${PN} += "${exec_prefix}/${TARGET_SYS}" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_12.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_12.0.0.bb new file mode 100644 index 0000000..6d01d35 --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_12.0.0.bb @@ -0,0 +1,31 @@ +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}" + +inherit autotools nativesdk + +BUILDSDK_CPPFLAGS:append = " -isystem${STAGING_INCDIR}" + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "nativesdk-mingw-w64-headers virtual/${TARGET_PREFIX}gcc " + +PROVIDES += "virtual/nativesdk-libc" + +# Work around pulling in eglibc for now... +PROVIDES += "virtual/nativesdk-libintl" + +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" + +EXTRA_OECONF:x86-64 = "--disable-lib32" + +do_configure() { + oe_runconf +} + +FILES:${PN} += "${exec_prefix}/libsrc" + 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 deleted file mode 100644 index 1aa470e..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -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}" - -inherit autotools nativesdk - -BUILDSDK_CPPFLAGS:append = " -isystem${STAGING_INCDIR}" - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "nativesdk-mingw-w64-headers virtual/${TARGET_PREFIX}gcc " - -PROVIDES += "virtual/nativesdk-libc" - -# Work around pulling in eglibc for now... -PROVIDES += "virtual/nativesdk-libintl" - -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" - -EXTRA_OECONF:x86-64 = "--disable-lib32" - -do_configure() { - oe_runconf -} - -FILES:${PN} += "${exec_prefix}/libsrc" - diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_12.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_12.0.0.bb new file mode 100644 index 0000000..fb7e54e --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_12.0.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Winpthreads runtime libraries from MinGW-w64 project" + +require mingw-w64.inc + +S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-libraries/winpthreads" +B = "${WORKDIR}/build-${TARGET_SYS}" + +inherit autotools nativesdk + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "nativesdk-mingw-w64-runtime virtual/${TARGET_PREFIX}gcc" + +do_configure() { + oe_runconf +} + +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" + +do_install:append() { + # headers are already installed by mingw-w64-headers + rm -rf ${D}${includedir} +} diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_9.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_9.0.0.bb deleted file mode 100644 index fb7e54e..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_9.0.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Winpthreads runtime libraries from MinGW-w64 project" - -require mingw-w64.inc - -S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-libraries/winpthreads" -B = "${WORKDIR}/build-${TARGET_SYS}" - -inherit autotools nativesdk - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "nativesdk-mingw-w64-runtime virtual/${TARGET_PREFIX}gcc" - -do_configure() { - oe_runconf -} - -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" - -do_install:append() { - # headers are already installed by mingw-w64-headers - rm -rf ${D}${includedir} -} -- cgit v1.2.3-54-g00ecf