diff options
author | Aníbal Limón <anibal.limon@linaro.org> | 2018-12-26 19:33:29 +0100 |
---|---|---|
committer | Aníbal Limón <anibal.limon@linaro.org> | 2018-12-28 11:14:19 -0600 |
commit | 1107d1a2d3bb9664d43d6bc261d4f3f9484e1713 (patch) | |
tree | e2b5dda1b220174bf7643ecbe73ee5250629c17c | |
parent | edb7ffc2a121df7596385595abe75180296103e0 (diff) |
meta-linaro-toolchain/recipes-devtools: GCC remove gcc-cross{,sdk}-initial
Recently gcc-cross{,sdk}-initial was removed in OE core, next are changes to use gcc-cross.
http://git.openembedded.org/openembedded-core/commit/?id=62b7308b8c4d2b439a15a4f7cbc6f823077bb0be
http://git.openembedded.org/openembedded-core/commit/?id=d84971928b68efddbdb6344b1021d998c9e26adb
http://git.openembedded.org/openembedded-core/commit/?id=122217b421f749b5fef52bea44ad6e04bc8f8d3a
Change-Id: If9160b56f1c4681eb778b524586401f1570a8a2d
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
17 files changed, 3 insertions, 148 deletions
diff --git a/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc b/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc index ef582984..a6eb0b77 100644 --- a/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc +++ b/meta-linaro-toolchain/conf/distro/include/tcmode-external-linaro.inc @@ -27,7 +27,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-linaro-toolchain" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-linaro-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-linaro-toolchain" PREFERRED_PROVIDER_glibc = "external-linaro-toolchain" PREFERRED_PROVIDER_libgcc = "external-linaro-toolchain" diff --git a/meta-linaro-toolchain/recipes-core/glibc/glibc-initial_linaro-2.20.bb b/meta-linaro-toolchain/recipes-core/glibc/glibc-initial_linaro-2.20.bb deleted file mode 100644 index a31ba68a..00000000 --- a/meta-linaro-toolchain/recipes-core/glibc/glibc-initial_linaro-2.20.bb +++ /dev/null @@ -1,11 +0,0 @@ -require glibc_${PV}.bb -require recipes-core/glibc/glibc-initial.inc - -DEPENDS += "kconfig-frontends-native" - -# main glibc recipes muck with TARGET_CPPFLAGS to point into -# final target sysroot but we -# are not there when building glibc-initial -# so reset it here - -TARGET_CPPFLAGS = "" diff --git a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index e0fb3eb3..e262213c 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -17,7 +17,6 @@ PROVIDES += "\ virtual/${TARGET_PREFIX}g++ \ virtual/${TARGET_PREFIX}gcc-initial \ virtual/${TARGET_PREFIX}binutils \ - virtual/${TARGET_PREFIX}libc-for-gcc \ virtual/${TARGET_PREFIX}compilerlibs \ virtual/libc \ virtual/libintl \ diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial.inc deleted file mode 100644 index 892b1dbf..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial.inc +++ /dev/null @@ -1,89 +0,0 @@ -DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}" -PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" -PACKAGES = "" - -INHIBIT_AUTOTOOLS_DEPS = "1" -INHIBIT_DEFAULT_DEPS = "1" - -# We still need gnu-config-native -DEPENDS_prepend = "gnu-config-native autoconf-native " - -PN = "gcc-cross-initial-${TARGET_ARCH}" - -CROSS_TARGET_SYS_DIR_append = ".${PN}" - -# This is intended to be a -very- basic config -# sysroot is needed in case we use libc-initial -EXTRA_OECONF = "\ - --with-newlib \ - --without-headers \ - --disable-shared \ - --disable-threads \ - --disable-multilib \ - --disable-__cxa_atexit \ - --enable-languages=c \ - --program-prefix=${TARGET_PREFIX} \ - --with-sysroot=/not/exist \ - --with-build-sysroot=${STAGING_DIR_TARGET} \ - ${EXTRA_OECONF_INITIAL} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \ - ${EXTRA_OECONF_GCC_FLOAT} \ - ${@get_gcc_ppc_plt_settings(bb, d)} \ -" - -EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}" - -do_compile () { - oe_runmake all-gcc configure-target-libgcc - (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h) -} - -do_install () { - ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h-forbuild install-unwind_h) - oe_runmake 'DESTDIR=${D}' install-gcc - - # We don't really need this (here shares/ contains man/, info/, locale/). - rm -rf ${D}${datadir}/ - - # We use libiberty from binutils - find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f - find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f - - # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are - # found. These need to be relative paths so they work in different locations. - dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ - install -d $dest - useld=${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '.bfd', '', d)} - ln -sf ${BINRELPATH}/${TARGET_PREFIX}ld${useld} ${dest}ld - for t in ar as nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do - ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t - done - # fixed limits.h infact includes the so called real limits.h - # which should come from libc but when we build libc-initial - # then bunch of configure tests include fixed limits.h which in turn - # includes real limits.h but this real limits.h is not staged yet - # so we overwirte the generated include-fixed/limits.h for gcc-cross-initial - # to get rid references to real limits.h - cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include/limits.h -} -# -# Override the default sysroot staging copy since this won't look like a target system -# -sysroot_stage_all() { - sysroot_stage_dir ${D} ${SYSROOT_DESTDIR} - install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ - install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ - mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true - mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true -} - -do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/" -do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}" - -inherit nopackages - -COMPILERINITIAL = "-initial" - - -# We really only want this built by things that need it, not any recrdeptask -deltask do_build diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.9.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.9.bb deleted file mode 100644 index f118094e..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.9.bb +++ /dev/null @@ -1,4 +0,0 @@ -BASEPV = "4.9" -PV = "linaro-${BASEPV}" -require recipes-devtools/gcc/gcc-cross_${PV}.bb -require recipes-devtools/gcc/gcc-cross-initial.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb deleted file mode 100644 index a1af8f38..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -BASEPV = "5.2" -PV = "linaro-${BASEPV}" -require recipes-devtools/gcc/gcc-cross_${PV}.bb -require recipes-devtools/gcc/gcc-cross-initial.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.3.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.3.bb deleted file mode 100644 index 5dd1fc4f..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -BASEPV = "5.3" -PV = "linaro-${BASEPV}" -require recipes-devtools/gcc/gcc-cross_${PV}.bb -require recipes-devtools/gcc/gcc-cross-initial.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-6.3.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-6.3.bb deleted file mode 100644 index 22d4b05c..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-6.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require recipes-devtools/gcc/gcc-cross_${PV}.bb -require recipes-devtools/gcc/gcc-cross-initial.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.1.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.1.bb deleted file mode 100644 index 22d4b05c..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require recipes-devtools/gcc/gcc-cross_${PV}.bb -require recipes-devtools/gcc/gcc-cross-initial.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.2.bb deleted file mode 100644 index 22d4b05c..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require recipes-devtools/gcc/gcc-cross_${PV}.bb -require recipes-devtools/gcc/gcc-cross-initial.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc index ab15e5e3..0d5a9de1 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc @@ -2,7 +2,7 @@ inherit cross INHIBIT_DEFAULT_DEPS = "1" EXTRADEPENDS = "" -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc ${EXTRADEPENDS} ${NATIVEDEPS}" +DEPENDS = "virtual/${TARGET_PREFIX}binutils ${EXTRADEPENDS} ${NATIVEDEPS}" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" python () { if d.getVar("TARGET_OS").startswith("linux"): @@ -32,7 +32,6 @@ EXTRA_OECONF += "\ --with-system-zlib \ " -DEPENDS_remove_libc-baremetal := "virtual/${TARGET_PREFIX}libc-for-gcc" EXTRA_OECONF_append_libc-baremetal = " --without-headers" EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix" EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix" @@ -210,8 +209,8 @@ do_gcc_stash_builddir () { addtask do_gcc_stash_builddir after do_compile before do_install SSTATETASKS += "do_gcc_stash_builddir" do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}" -do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}" -do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}" +do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}" +do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}" python do_gcc_stash_builddir_setscene () { sstate_setscene(d) diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb deleted file mode 100644 index f42e8b89..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb +++ /dev/null @@ -1,5 +0,0 @@ -require gcc-linaro-common-4.9.inc -require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb -require recipes-devtools/gcc/gcc-crosssdk-initial.inc - -EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} " diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb deleted file mode 100644 index 176a24f7..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require gcc-linaro-common-5.2.inc -require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb -require recipes-devtools/gcc/gcc-crosssdk-initial.inc - -EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} " diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.3.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.3.bb deleted file mode 100644 index fb3afb73..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require gcc-linaro-common-5.3.inc -require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb -require recipes-devtools/gcc/gcc-crosssdk-initial.inc - -EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} " diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-6.3.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-6.3.bb deleted file mode 100644 index c0b66267..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-6.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb -require recipes-devtools/gcc/gcc-crosssdk-initial.inc - diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.1.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.1.bb deleted file mode 100644 index c0b66267..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb -require recipes-devtools/gcc/gcc-crosssdk-initial.inc - diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.2.bb deleted file mode 100644 index c0b66267..00000000 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb -require recipes-devtools/gcc/gcc-crosssdk-initial.inc - |