From 3430f39a6d6b692579e6b0d7331ff5b7e10e7349 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Tue, 30 Jun 2020 16:30:44 -0500 Subject: mingw-w64: Upgrade to 7.0.0 Signed-off-by: Joshua Watt --- recipes-devtools/mingw-w64/mingw-w64.inc | 3 +-- .../mingw-w64/nativesdk-mingw-w64-headers_6.0.0.bb | 30 ---------------------- .../mingw-w64/nativesdk-mingw-w64-headers_7.0.0.bb | 26 +++++++++++++++++++ .../mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb | 27 ------------------- .../mingw-w64/nativesdk-mingw-w64-runtime_7.0.0.bb | 27 +++++++++++++++++++ .../nativesdk-mingw-w64-winpthreads_6.0.0.bb | 22 ---------------- .../nativesdk-mingw-w64-winpthreads_7.0.0.bb | 22 ++++++++++++++++ 7 files changed, 76 insertions(+), 81 deletions(-) delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_6.0.0.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_7.0.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_7.0.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_6.0.0.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_7.0.0.bb diff --git a/recipes-devtools/mingw-w64/mingw-w64.inc b/recipes-devtools/mingw-w64/mingw-w64.inc index 8c68bcc..a435dea 100644 --- a/recipes-devtools/mingw-w64/mingw-w64.inc +++ b/recipes-devtools/mingw-w64/mingw-w64.inc @@ -5,8 +5,7 @@ COMPATIBLE_HOST = ".*-mingw.*" SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" -SRC_URI[md5sum] = "cf5673f6d689bb5e02863e6284cc3d03" -SRC_URI[sha256sum] = "805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0" +SRC_URI[sha256sum] = "aa20dfff3596f08a7f427aab74315a6cb80c2b086b4a107ed35af02f9496b628" 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_6.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_6.0.0.bb deleted file mode 100644 index 58073d6..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_6.0.0.bb +++ /dev/null @@ -1,30 +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 = "" - -PACKAGECONFIG ??= "secure-api" - -PACKAGECONFIG[secure-api] = "--enable-secure-api,--disable-secure-api" - -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_7.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_7.0.0.bb new file mode 100644 index 0000000..292d22b --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_7.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-runtime_6.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb deleted file mode 100644 index cf39c6a..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Runtime libraries from MinGW-w64 project" - -require mingw-w64.inc - -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}" - -do_configure() { - oe_runconf -} - -FILES_${PN} += "${exec_prefix}/libsrc" - diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_7.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_7.0.0.bb new file mode 100644 index 0000000..cf39c6a --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_7.0.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Runtime libraries from MinGW-w64 project" + +require mingw-w64.inc + +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}" + +do_configure() { + oe_runconf +} + +FILES_${PN} += "${exec_prefix}/libsrc" + diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_6.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_6.0.0.bb deleted file mode 100644 index e694e5b..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_6.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} -} diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_7.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_7.0.0.bb new file mode 100644 index 0000000..e694e5b --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_7.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} +} -- cgit v1.2.3-54-g00ecf