cross-canadian: Handle powerpc linux verses linux-gnuspe
PowerPC toolchains can use the OS "linux" or "linux-gnuspe". This patch links them together so the one cross-canadian toolchain can support both. GCC_FOR_TARGET is set for the GCC recipe as otherwise configure can pick up an incorrect value. [YOCTO #5354] (From OE-Core master rev: a1d6331238982b0c5d39b0a18794f6654b00d46a) (From OE-Core rev: b114b045687776ebc5c805e1f19758e7e37eebf2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
52bc1c3dd7
commit
11d9127ac5
|
@ -15,12 +15,30 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
|
|||
# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
|
||||
#
|
||||
PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}"
|
||||
CANADIANEXTRAOS = ""
|
||||
python () {
|
||||
archs = d.getVar('PACKAGE_ARCHS', True).split()
|
||||
sdkarchs = []
|
||||
for arch in archs:
|
||||
sdkarchs.append(arch + '-${SDKPKGSUFFIX}')
|
||||
d.setVar('PACKAGE_ARCHS', " ".join(sdkarchs))
|
||||
|
||||
# PowerPC can build "linux" and "linux-gnuspe"
|
||||
tarch = d.getVar("TARGET_ARCH", True)
|
||||
if tarch == "powerpc":
|
||||
tos = d.getVar("TARGET_OS", True)
|
||||
if (tos != "linux" and tos != "linux-gnuspe"):
|
||||
bb.fatal("Building cross-candian powerpc for an unknown TARGET_SYS (%s), please update cross-canadian.bbclass" % d.getVar("TARGET_SYS", True))
|
||||
# Have to expand DEPENDS before we change the extensions
|
||||
d.setVar("DEPENDS", d.getVar("DEPENDS", True))
|
||||
d.setVar("STAGING_BINDIR_TOOLCHAIN", d.getVar("STAGING_BINDIR_TOOLCHAIN", True))
|
||||
for prefix in ["AR", "AS", "DLLTOOL", "CC", "CXX", "GCC", "LD", "LIPO", "NM", "OBJDUMP", "RANLIB", "STRIP", "WINDRES"]:
|
||||
n = prefix + "_FOR_TARGET"
|
||||
d.setVar(n, d.getVar(n, True))
|
||||
|
||||
d.setVar("LIBCEXTENSION", "")
|
||||
d.setVar("ABIEXTENSION", "")
|
||||
d.setVar("CANADIANEXTRAOS", "linux-gnuspe")
|
||||
}
|
||||
MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
|
||||
|
||||
|
@ -100,3 +118,16 @@ TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
|
|||
# points to the wrong place so force it
|
||||
SHLIBSDIRS = "${PKGDATA_DIR}/nativesdk-shlibs"
|
||||
SHLIBSWORKDIR = "${PKGDATA_DIR}/nativesdk-shlibs"
|
||||
|
||||
cross_canadian_bindirlinks () {
|
||||
for i in ${CANADIANEXTRAOS}
|
||||
do
|
||||
d=${D}${bindir}/../${TARGET_ARCH}${TARGET_VENDOR}-$i
|
||||
install -d $d
|
||||
for j in `ls ${D}${bindir}`
|
||||
do
|
||||
p=${TARGET_ARCH}${TARGET_VENDOR}-$i-`echo $j | sed -e s,${TARGET_PREFIX},,`
|
||||
ln -s ../${TARGET_SYS}/$j $d/$p
|
||||
done
|
||||
done
|
||||
}
|
||||
|
|
|
@ -22,6 +22,8 @@ do_install () {
|
|||
rm -f ${D}${libdir}/libiberty*
|
||||
rm -f ${D}${libdir}/libopcodes*
|
||||
rm -f ${D}${includedir}/*.h
|
||||
|
||||
cross_canadian_bindirlinks
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = ""
|
||||
|
|
|
@ -29,6 +29,7 @@ export AS_FOR_TARGET = "${TARGET_PREFIX}as"
|
|||
export DLLTOOL_FOR_TARGET = "${TARGET_PREFIX}dlltool"
|
||||
export CC_FOR_TARGET = "${TARGET_PREFIX}gcc"
|
||||
export CXX_FOR_TARGET = "${TARGET_PREFIX}g++"
|
||||
export GCC_FOR_TARGET = "${TARGET_PREFIX}gcc"
|
||||
export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
|
||||
export LIPO_FOR_TARGET = "${TARGET_PREFIX}lipo"
|
||||
export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
|
||||
|
@ -69,7 +70,7 @@ EXCLUDE_FROM_SHLIBS = "1"
|
|||
PACKAGES = "${PN} ${PN}-doc"
|
||||
|
||||
FILES_${PN} = "\
|
||||
${bindir}/* \
|
||||
${exec_prefix}/bin/* \
|
||||
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \
|
||||
${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
|
||||
${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
|
||||
|
@ -137,6 +138,8 @@ do_install () {
|
|||
done
|
||||
|
||||
chown -R root:root ${D}
|
||||
|
||||
cross_canadian_bindirlinks
|
||||
}
|
||||
|
||||
ELFUTILS = "nativesdk-elfutils"
|
||||
|
|
|
@ -31,5 +31,6 @@ EOF
|
|||
# right bits installed by binutils.
|
||||
do_install_append() {
|
||||
rm -rf ${D}${exec_prefix}/lib
|
||||
cross_canadian_bindirlinks
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue