From e328dbc6deaad899c33e2fc8052fbd98fc54ae77 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 11 May 2015 11:00:03 -0700 Subject: [PATCH] gcc-{sanitizers,runtime}: adjust for gcc-source name change Signed-off-by: Christopher Larson --- recipes-external/gcc/gcc-runtime-external.bb | 6 ++++-- recipes-external/gcc/gcc-sanitizers-external.bb | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes-external/gcc/gcc-runtime-external.bb b/recipes-external/gcc/gcc-runtime-external.bb index de3a025..a249283 100644 --- a/recipes-external/gcc/gcc-runtime-external.bb +++ b/recipes-external/gcc/gcc-runtime-external.bb @@ -10,11 +10,13 @@ LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" DEPENDS = "libgcc" EXTRA_OECONF = "" python () { + gccs = d.expand('gcc-source-${PV}') + lic_deps = d.getVarFlag('do_populate_lic', 'depends', True).split() - d.setVarFlag('do_populate_lic', 'depends', ' '.join(filter(lambda d: d != 'gcc-source:do_unpack', lic_deps))) + d.setVarFlag('do_populate_lic', 'depends', ' '.join(filter(lambda d: d != '{}:do_unpack'.format(gccs), lic_deps))) cfg_deps = d.getVarFlag('do_configure', 'depends', True).split() - d.setVarFlag('do_configure', 'depends', ' '.join(filter(lambda d: d != 'gcc-source:do_preconfigure', cfg_deps))) + d.setVarFlag('do_configure', 'depends', ' '.join(filter(lambda d: d != '{}:do_preconfigure'.format(gccs), cfg_deps))) } target_libdir = "${libdir}" diff --git a/recipes-external/gcc/gcc-sanitizers-external.bb b/recipes-external/gcc/gcc-sanitizers-external.bb index 38e82a3..4843a45 100644 --- a/recipes-external/gcc/gcc-sanitizers-external.bb +++ b/recipes-external/gcc/gcc-sanitizers-external.bb @@ -10,9 +10,11 @@ EXTRA_OECONF = "" BBCLASSEXTEND = "" python () { + gccs = d.expand('gcc-source-${PV}') + lic_deps = d.getVarFlag('do_populate_lic', 'depends', True).split() - d.setVarFlag('do_populate_lic', 'depends', ' '.join(filter(lambda d: d != 'gcc-source:do_unpack', lic_deps))) + d.setVarFlag('do_populate_lic', 'depends', ' '.join(filter(lambda d: d != '{}:do_unpack'.format(gccs), lic_deps))) cfg_deps = d.getVarFlag('do_configure', 'depends', True).split() - d.setVarFlag('do_configure', 'depends', ' '.join(filter(lambda d: d != 'gcc-source:do_preconfigure', cfg_deps))) + d.setVarFlag('do_configure', 'depends', ' '.join(filter(lambda d: d != '{}:do_preconfigure'.format(gccs), cfg_deps))) }