From bfda0f040958b3c533123071ff031037389eed62 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 10 Feb 2017 09:13:34 +0200 Subject: mingw64: update to 5.0.0 QtBase depends on new API (SHGetKnownFolderPath) that was not available in previous version. BUILDSDK_CPPFLAGS were emptied from poky.conf, but are needed for mingw build to include correct float.h. (error: '_MCW_DN' undeclared here) Change-Id: Ieca1431e4c827456b40e2151a16760bd7f66235a Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- .../mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb | 29 ----------------- .../mingw-w64/nativesdk-mingw-w64-headers_5.0.0.bb | 29 +++++++++++++++++ .../mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb | 36 -------------------- .../mingw-w64/nativesdk-mingw-w64-runtime_5.0.0.bb | 38 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 65 deletions(-) delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_5.0.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_5.0.0.bb diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb deleted file mode 100644 index 06312d6..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb +++ /dev/null @@ -1,29 +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" - -SRC_URI[md5sum] = "df0e7657f46cbd59ed9cbe2a50c66e15" -SRC_URI[sha256sum] = "ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2" - -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() { - : -} - -FILES_${PN} += "${exec_prefix}/${TARGET_SYS}" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_5.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_5.0.0.bb new file mode 100644 index 0000000..5126a35 --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_5.0.0.bb @@ -0,0 +1,29 @@ +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" + +SRC_URI[md5sum] = "c9f4bb72a87d9be2cc98e0d7e1868c88" +SRC_URI[sha256sum] = "e41d8ca739e22b4215c8ebe99ed2fc398c734cae73877f3143c394661b096d08" + +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() { + : +} + +FILES_${PN} += "${exec_prefix}/${TARGET_SYS}" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb deleted file mode 100644 index c4292ad..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb +++ /dev/null @@ -1,36 +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] = "df0e7657f46cbd59ed9cbe2a50c66e15" -SRC_URI[sha256sum] = "ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2" - -S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-crt" -B = "${WORKDIR}/build-${TARGET_SYS}" - -inherit autotools nativesdk - -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_5.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_5.0.0.bb new file mode 100644 index 0000000..d8945e3 --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_5.0.0.bb @@ -0,0 +1,38 @@ +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] = "c9f4bb72a87d9be2cc98e0d7e1868c88" +SRC_URI[sha256sum] = "e41d8ca739e22b4215c8ebe99ed2fc398c734cae73877f3143c394661b096d08" + +S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-crt" +B = "${WORKDIR}/build-${TARGET_SYS}" + +inherit autotools nativesdk + +BUILDSDK_CPPFLAGS = "-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" + -- cgit v1.2.3