From 67db7182faf6742b0d971d61d8c5ba34f69d2e12 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 29 Apr 2015 10:35:00 +0100 Subject: 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). Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-shared-source.inc | 4 ++-- meta/recipes-devtools/gcc/gcc-source.inc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/gcc') diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc index cb5d9071b6..9acffb1da7 100644 --- a/meta/recipes-devtools/gcc/gcc-shared-source.inc +++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc @@ -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" diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 10e9285c44..a4b27c8fd3 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -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}:" -- cgit v1.2.3