diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-27 01:23:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-30 16:33:26 +0100 |
commit | a2c5509520d5c3e082f55844e6545d0309565f8f (patch) | |
tree | a3814135e0658d4c48ab5318bca919a9123e4227 /meta/recipes-devtools/gcc | |
parent | 7d6050c57f195589c8429397432c78f68298b672 (diff) | |
download | openembedded-core-a2c5509520d5c3e082f55844e6545d0309565f8f.tar.gz openembedded-core-a2c5509520d5c3e082f55844e6545d0309565f8f.tar.bz2 openembedded-core-a2c5509520d5c3e082f55844e6545d0309565f8f.zip |
binutils/gcc/gdb: Add TARGET_ARCH to PN for all cross recipes
This allows them to co-exist together in the native sysroot, with one
set of cross tools per target architecture.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-initial.inc | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross.inc | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-crosssdk.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-runtime.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/libgcc-common.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/libgcc-initial.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/libgfortran.inc | 2 |
10 files changed, 20 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 1e00249b19..a96bcaa92c 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -7,6 +7,8 @@ NATIVEDEPS = "" inherit autotools gettext +BPN = "gcc" + def get_gcc_fpu_setting(bb, d): if d.getVar('ARMPKGSFX_EABI', True) == "hf" and d.getVar('TRANSLATED_TARGET_ARCH', True) == "arm": return "--with-float=hard" diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 8d979b1144..307f73c8ed 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -2,7 +2,6 @@ inherit cross-canadian SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)" PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" -BPN = "gcc" DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext" diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 897e055cf3..5a6da8bbd2 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -5,6 +5,8 @@ PACKAGES = "" INHIBIT_AUTOTOOLS_DEPS = "1" INHIBIT_DEFAULT_DEPS = "1" +PN = "gcc-cross-initial-${TARGET_ARCH}" + CROSS_TARGET_SYS_DIR_append = ".${PN}" # This is intended to be a -very- basic config @@ -68,8 +70,8 @@ do_install () { # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build case ${PN} in - *gcc-cross-initial|*gcc-crosssdk-initial) - dest=${D}/${includedir}/gcc-build-internal-initial-${MULTIMACH_TARGET_SYS} + *gcc-cross-initial-${TARGET_ARCH}|*gcc-crosssdk-initial-${TARGET_ARCH}) + dest=${D}/${includedir}/gcc-build-internal-initial-${TARGET_SYS} hardlinkdir . $dest ;; esac diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 27ebcf6485..ef88d3f49c 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -9,6 +9,8 @@ python () { d.setVar("EXTRADEPENDS", "linux-libc-headers") } +PN = "gcc-cross-${TARGET_ARCH}" + require gcc-configure-common.inc EXTRA_OECONF += " --enable-poison-system-directories" @@ -138,7 +140,7 @@ STOP INHIBIT_PACKAGE_STRIP = "1" # Compute how to get from libexecdir to bindir in python (easier than shell) -BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}" +BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}" do_install () { ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h ) @@ -177,8 +179,8 @@ do_install () { # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build case ${PN} in - *gcc-cross|*gcc-crosssdk) - dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS} + *gcc-cross-${TARGET_ARCH}|*gcc-crosssdk-${TARGET_ARCH}) + dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS} hardlinkdir . $dest ;; esac diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc index c6f74a6445..7d2599cb6c 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc @@ -1,5 +1,7 @@ inherit crosssdk +PN = "gcc-crosssdk-initial-${TARGET_ARCH}" + SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/" SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc index 5fe0b947dd..53f880f39b 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc +++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc @@ -1,5 +1,7 @@ inherit crosssdk +PN = "gcc-crosssdk-${TARGET_ARCH}" + SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/" SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 2e82a09b1c..5fd2a8c8b0 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -20,7 +20,7 @@ RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic" do_configure () { export CXX="${CXX} -nostdinc++ -nostdlib++" - mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B} for d in libgcc ${RUNTIMETARGET}; do diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index b30bcfeaeb..c81a80c6de 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -3,7 +3,7 @@ BPN = "libgcc" INHIBIT_DEFAULT_DEPS = "1" do_configure () { - target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` install -d ${D}${base_libdir} ${D}${libdir} hardlinkdir ${STAGING_INCDIR_NATIVE}/${LIBGCCBUILDTREENAME}$target/ ${B} mkdir -p ${B}/${BPN} diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc index 2ba27a81d8..27e2e45aa6 100644 --- a/meta/recipes-devtools/gcc/libgcc-initial.inc +++ b/meta/recipes-devtools/gcc/libgcc-initial.inc @@ -2,8 +2,8 @@ require libgcc-common.inc DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" -STAGINGCC = "gcc-cross-initial" -STAGINGCC_class-nativesdk = "gcc-crosssdk-initial" +STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" +STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" PACKAGES = "" diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc index 30e5ffeead..7bf412134b 100644 --- a/meta/recipes-devtools/gcc/libgfortran.inc +++ b/meta/recipes-devtools/gcc/libgfortran.inc @@ -5,7 +5,7 @@ EXTRA_OECONF_PATHS = " \ --with-build-sysroot=${STAGING_DIR_TARGET}" do_configure () { - mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B} |