mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
gcc-shared-source: Add PV to PN
This means you can have one gcc version for some gcc recipes
(e.g. crosssdk/nativesdk) and another gcc version for target code.
Also remove the preferred version entry from the default toolchains
list since the version issue is now handled automatically.
We also need to specifically handle gcc-source in the license handling
code since expanding ${PV} in the base class isn't possible. Since
gcc-source doesn't generate any packages directly this shouldn't be
an issue and whitelisting in this way is easiest (and matches the
rest of the toolchain handling).
(From OE-Core rev: 67db7182faf6742b0d971d61d8c5ba34f69d2e12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -468,6 +468,8 @@ python () {
|
||||
"-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
|
||||
if pn.endswith(d.expand(t)):
|
||||
check_license = False
|
||||
if pn.startswith("gcc-source-"):
|
||||
check_license = False
|
||||
|
||||
if check_license and bad_licenses:
|
||||
bad_licenses = expand_wildcard_licenses(d, bad_licenses)
|
||||
|
||||
@@ -38,7 +38,6 @@ PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-source ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
|
||||
PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}"
|
||||
PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
|
||||
|
||||
@@ -5,5 +5,5 @@ do_fetch[noexec] = "1"
|
||||
deltask do_unpack
|
||||
deltask do_patch
|
||||
|
||||
do_configure[depends] += "gcc-source:do_preconfigure"
|
||||
do_populate_lic[depends] += "gcc-source:do_unpack"
|
||||
do_configure[depends] += "gcc-source-${PV}:do_preconfigure"
|
||||
do_populate_lic[depends] += "gcc-source-${PV}:do_unpack"
|
||||
|
||||
@@ -11,6 +11,7 @@ deltask do_package_qa
|
||||
deltask do_packagedata
|
||||
deltask do_rm_work
|
||||
|
||||
PN = "gcc-source-${PV}"
|
||||
WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}"
|
||||
SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user