From 7e2e23972e0b93eed7e2164036be3aa657b0e9c6 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 27 Jun 2014 10:45:16 -0500 Subject: gcc: Uprev gcc and related to latest version Uprev gcc to match master, and resync with latest mingw runtime. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- .../gcc/gcc-cross-canadian_4.8.bbappend | 6 ---- .../gcc/gcc-cross-canadian_4.9.bbappend | 6 ++++ .../gcc/gcc-crosssdk-initial_4.8.bbappend | 1 - .../gcc/gcc-crosssdk-initial_4.9.bbappend | 1 + recipes-devtools/gcc/gcc-crosssdk_4.8.bbappend | 1 - recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend | 1 + recipes-devtools/gcc/gcc-runtime_4.8.bbappend | 8 ----- recipes-devtools/gcc/gcc-runtime_4.9.bbappend | 8 +++++ recipes-devtools/gcc/libgcc_4.8.bbappend | 2 -- recipes-devtools/gcc/libgcc_4.9.bbappend | 2 ++ .../mingw-w64/nativesdk-mingw-w64-headers_2.0.8.bb | 41 ---------------------- .../mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb | 29 +++++++++++++++ .../mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb | 41 ---------------------- .../mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb | 36 +++++++++++++++++++ 14 files changed, 83 insertions(+), 100 deletions(-) delete mode 100644 recipes-devtools/gcc/gcc-cross-canadian_4.8.bbappend create mode 100644 recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend delete mode 100644 recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bbappend create mode 100644 recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend delete mode 100644 recipes-devtools/gcc/gcc-crosssdk_4.8.bbappend create mode 100644 recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend delete mode 100644 recipes-devtools/gcc/gcc-runtime_4.8.bbappend create mode 100644 recipes-devtools/gcc/gcc-runtime_4.9.bbappend delete mode 100644 recipes-devtools/gcc/libgcc_4.8.bbappend create mode 100644 recipes-devtools/gcc/libgcc_4.9.bbappend delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_2.0.8.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb delete mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb create mode 100644 recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb (limited to 'recipes-devtools') diff --git a/recipes-devtools/gcc/gcc-cross-canadian_4.8.bbappend b/recipes-devtools/gcc/gcc-cross-canadian_4.8.bbappend deleted file mode 100644 index 030a9b9..0000000 --- a/recipes-devtools/gcc/gcc-cross-canadian_4.8.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -INSANE_SKIP_${PN}_append_sdkmingw32 = " staticdev" -EXTRA_OECONF_append_sdkmingw32 = " --disable-nls" -LDFLAGS_append_sdkmingw32 = " -Wl,-static" -EXEEXT_sdkmingw32 = ".exe" -ELFUTILS_sdkmingw32 = "" -DEPENDS_remove_sdkmingw32 = "nativesdk-gettext" diff --git a/recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend b/recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend new file mode 100644 index 0000000..030a9b9 --- /dev/null +++ b/recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend @@ -0,0 +1,6 @@ +INSANE_SKIP_${PN}_append_sdkmingw32 = " staticdev" +EXTRA_OECONF_append_sdkmingw32 = " --disable-nls" +LDFLAGS_append_sdkmingw32 = " -Wl,-static" +EXEEXT_sdkmingw32 = ".exe" +ELFUTILS_sdkmingw32 = "" +DEPENDS_remove_sdkmingw32 = "nativesdk-gettext" diff --git a/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bbappend b/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bbappend deleted file mode 100644 index 1c09342..0000000 --- a/recipes-devtools/gcc/gcc-crosssdk-initial_4.8.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS_append_mingw32 = " nativesdk-mingw-w64-headers" diff --git a/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend b/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend new file mode 100644 index 0000000..1c09342 --- /dev/null +++ b/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend @@ -0,0 +1 @@ +DEPENDS_append_mingw32 = " nativesdk-mingw-w64-headers" diff --git a/recipes-devtools/gcc/gcc-crosssdk_4.8.bbappend b/recipes-devtools/gcc/gcc-crosssdk_4.8.bbappend deleted file mode 100644 index 77ba57f..0000000 --- a/recipes-devtools/gcc/gcc-crosssdk_4.8.bbappend +++ /dev/null @@ -1 +0,0 @@ -EXTRA_OECONF_mingw32 := "${@oe_filter_out('--with-linker-hash-style=${LINKER_HASH_STYLE}', '${EXTRA_OECONF}', d)}" diff --git a/recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend b/recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend new file mode 100644 index 0000000..77ba57f --- /dev/null +++ b/recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend @@ -0,0 +1 @@ +EXTRA_OECONF_mingw32 := "${@oe_filter_out('--with-linker-hash-style=${LINKER_HASH_STYLE}', '${EXTRA_OECONF}', d)}" diff --git a/recipes-devtools/gcc/gcc-runtime_4.8.bbappend b/recipes-devtools/gcc/gcc-runtime_4.8.bbappend deleted file mode 100644 index 50ca3ca..0000000 --- a/recipes-devtools/gcc/gcc-runtime_4.8.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILES_libstdc++_append_mingw32 = " ${bindir}/libstdc++*.dll" -FILES_libstdc++-staticdev_append_mingw32 = " ${libdir}/libstdc++.dll.a*" -FILES_libssp_append_mingw32 = " ${bindir}/libssp*.dll" -FILES_libgomp_append_mingw32 = " ${bindir}/libgomp*.dll" - -RUNTIMETARGET_remove_mingw32 = "libatomic" - -DEPENDS_append_mingw32 = " pthreads-win32" diff --git a/recipes-devtools/gcc/gcc-runtime_4.9.bbappend b/recipes-devtools/gcc/gcc-runtime_4.9.bbappend new file mode 100644 index 0000000..50ca3ca --- /dev/null +++ b/recipes-devtools/gcc/gcc-runtime_4.9.bbappend @@ -0,0 +1,8 @@ +FILES_libstdc++_append_mingw32 = " ${bindir}/libstdc++*.dll" +FILES_libstdc++-staticdev_append_mingw32 = " ${libdir}/libstdc++.dll.a*" +FILES_libssp_append_mingw32 = " ${bindir}/libssp*.dll" +FILES_libgomp_append_mingw32 = " ${bindir}/libgomp*.dll" + +RUNTIMETARGET_remove_mingw32 = "libatomic" + +DEPENDS_append_mingw32 = " pthreads-win32" diff --git a/recipes-devtools/gcc/libgcc_4.8.bbappend b/recipes-devtools/gcc/libgcc_4.8.bbappend deleted file mode 100644 index dd95317..0000000 --- a/recipes-devtools/gcc/libgcc_4.8.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILES_${PN}_append_mingw32 = " ${base_libdir}/libgcc*.dll" -FILES_${PN}-dev_append_mingw32 = " ${base_libdir}/libgcc*.a" diff --git a/recipes-devtools/gcc/libgcc_4.9.bbappend b/recipes-devtools/gcc/libgcc_4.9.bbappend new file mode 100644 index 0000000..dd95317 --- /dev/null +++ b/recipes-devtools/gcc/libgcc_4.9.bbappend @@ -0,0 +1,2 @@ +FILES_${PN}_append_mingw32 = " ${base_libdir}/libgcc*.dll" +FILES_${PN}-dev_append_mingw32 = " ${base_libdir}/libgcc*.a" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_2.0.8.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_2.0.8.bb deleted file mode 100644 index a3d0e46..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_2.0.8.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Header files from the MingGW-w64 project" -LICENSE = "ZPL" -LIC_FILES_CHKSUM = "file://../COPYING;md5=3194ff3a0d16f018784d1847bc6a3c4d" - -COMPATIBLE_HOST = ".*-mingw.*" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.gz \ - file://epsilon.patch" - -SRC_URI[md5sum] = "659e5baf45ac8e8b8526f29786ee1112" -SRC_URI[sha256sum] = "1a5a2c57f90c7f1b5eb8402a52f93de645925a8af62c2cfe748f39ce66008cf4" - -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}" - -do_install_append() { - # Move files to include folder where gcc-crosssdk-initial is looking - mv ${D}${exec_prefix}/${HOST_SYS}/include ${D}${exec_prefix} - rmdir ${D}${exec_prefix}/${HOST_SYS} - - ln -s ./ ${D}/${exec_prefix}/${HOST_SYS} -} - -sysroot_stage_all_append_mingw32 () { - ln -s ./ ${SYSROOT_DESTDIR}${exec_prefix}/${HOST_SYS} -} 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 new file mode 100644 index 0000000..33e8bbb --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_3.1.0.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Header files from the MingGW-w64 project" +LICENSE = "ZPL" +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-runtime_2.0.8.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb deleted file mode 100644 index 14b5c7d..0000000 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_2.0.8.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Runtime libraries from MinGW-w64 project" -LICENSE = "ZPL" -LIC_FILES_CHKSUM = "file://../COPYING;md5=3194ff3a0d16f018784d1847bc6a3c4d" - -COMPATIBLE_HOST = ".*-mingw.*" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.gz" -SRC_URI[md5sum] = "659e5baf45ac8e8b8526f29786ee1112" -SRC_URI[sha256sum] = "1a5a2c57f90c7f1b5eb8402a52f93de645925a8af62c2cfe748f39ce66008cf4" - -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-${TARGET_ARCH}" -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" -PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" - -do_configure() { - oe_runconf -} - -do_install_append() { - # Move files to folder where gcc-crosssdk is looking - mv ${D}${exec_prefix}/${HOST_SYS}/lib* ${D}${exec_prefix} - rmdir ${D}${exec_prefix}/${HOST_SYS} -} -FILES_${PN} += "${exec_prefix}/libsrc" - 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 new file mode 100644 index 0000000..4c56c70 --- /dev/null +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_3.1.0.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Runtime libraries from MinGW-w64 project" +LICENSE = "ZPL" +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-${TARGET_ARCH}" +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-54-g00ecf