From 7697cefbbd139361c4d3675f0d99104497b9677a Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Mon, 19 Nov 2018 16:24:32 -0600 Subject: mingw-w64-{headers,runtime,winpthreads}: Upgrade 5.0.3 -> 6.0.0 Upgrades the MinGW support recipes to the latest version Signed-off-by: Joshua Watt --- ...in-impl.h-do-not-define-_xgetbv-for-GCC-8.patch | 43 ---------------------- .../mingw-w64/mingw-w64-headers/epsilon.patch | 16 -------- recipes-devtools/mingw-w64/mingw-w64.inc | 14 +++++++ .../mingw-w64/nativesdk-mingw-w64-headers_5.0.3.bb | 39 -------------------- .../mingw-w64/nativesdk-mingw-w64-headers_6.0.0.bb | 30 +++++++++++++++ .../mingw-w64/nativesdk-mingw-w64-runtime_5.0.3.bb | 38 ------------------- .../mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb | 32 ++++++++++++++++ .../nativesdk-mingw-w64-winpthreads_5.0.3.bb | 31 ---------------- .../nativesdk-mingw-w64-winpthreads_6.0.0.bb | 25 +++++++++++++ 9 files changed, 101 insertions(+), 167 deletions(-) delete mode 100644 recipes-devtools/mingw-w64/mingw-w64-headers/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch delete mode 100644 recipes-devtools/mingw-w64/mingw-w64-headers/epsilon.patch create mode 100644 recipes-devtools/mingw-w64/mingw-w64.inc delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_5.0.3.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_6.0.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_5.0.3.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_5.0.3.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_6.0.0.bb diff --git a/recipes-devtools/mingw-w64/mingw-w64-headers/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch b/recipes-devtools/mingw-w64/mingw-w64-headers/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch deleted file mode 100644 index 366afdc..0000000 --- a/recipes-devtools/mingw-w64/mingw-w64-headers/0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 63d69029386701955e8fa10ac14be8d2316faf6f Mon Sep 17 00:00:00 2001 -From: Mateusz -Date: Mon, 22 Jan 2018 20:58:48 +0100 -Subject: [PATCH] intrin-impl.h: do not define _xgetbv for GCC 8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 8 from r248028 has defined function _xgetbv and we should -avoid double definition of this function. - -Signed-off-by: Mateusz Brzostek -Signed-off-by: Martin Storsjö ---- - mingw-w64-headers/include/psdk_inc/intrin-impl.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/mingw-w64-headers/include/psdk_inc/intrin-impl.h b/mingw-w64-headers/include/psdk_inc/intrin-impl.h -index 7da3238b..4990b0ae 100644 ---- a/mingw-w64-headers/include/psdk_inc/intrin-impl.h -+++ b/mingw-w64-headers/include/psdk_inc/intrin-impl.h -@@ -1405,6 +1405,7 @@ __buildmov(__movsd, unsigned __LONG32, "d") - #define __INTRINSIC_DEFINED___movsd - #endif /* __INTRINSIC_PROLOG */ - -+#if !defined(__GNUC__) || __GNUC__ < 8 /* GCC 8 has already defined _xgetbv */ - /* NOTE: This should be in immintrin.h */ - #if __INTRINSIC_PROLOG(_xgetbv) - unsigned __int64 _xgetbv(unsigned int); -@@ -1426,6 +1427,7 @@ unsigned __int64 _xgetbv(unsigned int index) - } - #define __INTRINSIC_DEFINED__xgetbv - #endif /* __INTRINSIC_PROLOG */ -+#endif /* __GNUC__ < 8 */ - - #endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */ - --- -2.11.0 - diff --git a/recipes-devtools/mingw-w64/mingw-w64-headers/epsilon.patch b/recipes-devtools/mingw-w64/mingw-w64-headers/epsilon.patch deleted file mode 100644 index 10213ee..0000000 --- a/recipes-devtools/mingw-w64/mingw-w64-headers/epsilon.patch +++ /dev/null @@ -1,16 +0,0 @@ -mpfr 3.1.2 references these symbols and fails if they're not defined. - -Index: mingw-w64-headers/crt/float.h -=================================================================== ---- mingw-w64-headers/crt.orig/float.h 2012-07-17 11:03:12.000000000 +0000 -+++ mingw-w64-headers/crt/float.h 2013-08-13 08:23:20.000000000 +0000 -@@ -111,6 +111,9 @@ - #define FLT_ROUNDS 1 - - #define _FLOAT_H___ -+ -+ #define DBL_EPSILON __DBL_EPSILON__ -+ #define FLT_EPSILON __FLT_EPSILON__ - #endif - #endif - #endif diff --git a/recipes-devtools/mingw-w64/mingw-w64.inc b/recipes-devtools/mingw-w64/mingw-w64.inc new file mode 100644 index 0000000..8c68bcc --- /dev/null +++ b/recipes-devtools/mingw-w64/mingw-w64.inc @@ -0,0 +1,14 @@ +LICENSE = "ZPL-2.1" +LIC_FILES_CHKSUM = "file://${WORKDIR}/mingw-w64-v${PV}/COPYING;md5=bb936f0e04d8f1e19ad545100cee9654" + +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" + +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_5.0.3.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_5.0.3.bb deleted file mode 100644 index 009e5af..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_5.0.3.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Header files from the MingGW-w64 project" -LICENSE = "ZPL-2.1" -LIC_FILES_CHKSUM = "file://../COPYING;md5=bb936f0e04d8f1e19ad545100cee9654" - -COMPATIBLE_HOST = ".*-mingw.*" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2 \ - file://epsilon.patch \ - file://0001-intrin-impl.h-do-not-define-_xgetbv-for-GCC-8.patch;striplevel=2" - -SRC_URI[md5sum] = "5524c20312560cc8683b7d8ee292cb8c" -SRC_URI[sha256sum] = "2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4" - -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_6.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_6.0.0.bb new file mode 100644 index 0000000..58073d6 --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_6.0.0.bb @@ -0,0 +1,30 @@ +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-runtime_5.0.3.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_5.0.3.bb deleted file mode 100644 index 0302334..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_5.0.3.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Runtime libraries from MinGW-w64 project" -LICENSE = "ZPL-2.1" -LIC_FILES_CHKSUM = "file://../COPYING;md5=bb936f0e04d8f1e19ad545100cee9654" - -COMPATIBLE_HOST = ".*-mingw.*" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" -SRC_URI[md5sum] = "5524c20312560cc8683b7d8ee292cb8c" -SRC_URI[sha256sum] = "2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4" - -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-initial " - -PROVIDES += "virtual/nativesdk-libc" -PROVIDES += "virtual/nativesdk-${SDK_PREFIX}libc-initial" -PROVIDES += "virtual/nativesdk-${SDK_PREFIX}libc-for-gcc" - -# Work around pulling in eglibc for now... -PROVIDES += "virtual/nativesdk-libintl" - -STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" -PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" - -do_configure() { - oe_runconf -} - -FILES_${PN} += "${exec_prefix}/libsrc" - 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 new file mode 100644 index 0000000..fc83ca8 --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_6.0.0.bb @@ -0,0 +1,32 @@ +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-initial " + +PROVIDES += "virtual/nativesdk-libc" +PROVIDES += "virtual/nativesdk-${SDK_PREFIX}libc-initial" +PROVIDES += "virtual/nativesdk-${SDK_PREFIX}libc-for-gcc" + +# Work around pulling in eglibc for now... +PROVIDES += "virtual/nativesdk-libintl" + +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" +PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" + +do_configure() { + oe_runconf +} + +FILES_${PN} += "${exec_prefix}/libsrc" + diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_5.0.3.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_5.0.3.bb deleted file mode 100644 index 1308760..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_5.0.3.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Winpthreads runtime libraries from MinGW-w64 project" -LICENSE = "ZPL-2.1" -LIC_FILES_CHKSUM = "file://../../COPYING;md5=bb936f0e04d8f1e19ad545100cee9654" - -COMPATIBLE_HOST = ".*-mingw.*" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" -SRC_URI[md5sum] = "5524c20312560cc8683b7d8ee292cb8c" -SRC_URI[sha256sum] = "2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4" - -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-initial" - -do_configure() { - oe_runconf -} - -STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" -PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" - -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_6.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_6.0.0.bb new file mode 100644 index 0000000..b278ad7 --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_6.0.0.bb @@ -0,0 +1,25 @@ +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-initial" + +do_configure() { + oe_runconf +} + +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}" +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" +PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" + +do_install_append() { + # headers are already installed by mingw-w64-headers + rm -rf ${D}${includedir} +} -- cgit v1.2.3-54-g00ecf