summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-29 10:35:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-30 23:04:12 +0100
commit7b88042b801403054e76c9bb51419c73acbb1d59 (patch)
tree0782726a254e9dba956ff42f43b44f721cc408d1 /meta/recipes-devtools/gcc
parent0321760d77070e59b5fbd509a33dd0b34fde628b (diff)
downloadpoky-7b88042b801403054e76c9bb51419c73acbb1d59.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-shared-source.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-source.inc1
2 files changed, 3 insertions, 2 deletions
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"
5deltask do_unpack 5deltask do_unpack
6deltask do_patch 6deltask do_patch
7 7
8do_configure[depends] += "gcc-source:do_preconfigure" 8do_configure[depends] += "gcc-source-${PV}:do_preconfigure"
9do_populate_lic[depends] += "gcc-source:do_unpack" 9do_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
11deltask do_packagedata 11deltask do_packagedata
12deltask do_rm_work 12deltask do_rm_work
13 13
14PN = "gcc-source-${PV}"
14WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}" 15WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}"
15SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:" 16SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:"
16 17