summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/conf/distro/include/tcmode-default.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-shared-source.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-source.inc1
4 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0032b302cf..c6494e3cea 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -468,6 +468,8 @@ python () {
468 "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]: 468 "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
469 if pn.endswith(d.expand(t)): 469 if pn.endswith(d.expand(t)):
470 check_license = False 470 check_license = False
471 if pn.startswith("gcc-source-"):
472 check_license = False
471 473
472 if check_license and bad_licenses: 474 if check_license and bad_licenses:
473 bad_licenses = expand_wildcard_licenses(d, bad_licenses) 475 bad_licenses = expand_wildcard_licenses(d, bad_licenses)
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index e3df93475f..096bec9fd6 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -38,7 +38,6 @@ PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}"
38PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" 38PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
39PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" 39PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
40PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" 40PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}"
41PREFERRED_VERSION_gcc-source ?= "${GCCVERSION}"
42PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" 41PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
43PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" 42PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}"
44PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" 43PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
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