From patchwork Thu Mar 22 15:00:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: powerpc: fix overly aggressive TUNE_PKGARCH set Date: Thu, 22 Mar 2012 15:00:03 -0000 From: Christopher Larson X-Patchwork-Id: 24137 Message-Id: <1332428403-25048-1-git-send-email-kergoth@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Christopher Larson From: Christopher Larson There's a problem in arch-powerpc.inc today, wherein it directly sets TUNE_PKGARCH, rather than setting TUNE_PKGARCH_tune-. As a result, more specific tuning files (e.g. ppce500mc) then see their TUNE_PKGARCH_tune- variable definitions no longer obeyed. As a consequence, the TUNE_PKGARCH ends up as 'powerpc' or 'powerpc-nf' rather than 'ppce500mc', which in turn causes a 'TUNE_PKGARCH not in PACKAGE_ARCHS' failure in the build. To fix, the .inc now sets TUNE_PKGARCH_tune-powerpc and TUNE_PKGARCH_tune-powerpc-nf rather than TUNE_PKGARCH. Signed-off-by: Christopher Larson --- meta/conf/machine/include/powerpc/arch-powerpc.inc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc index c9b2829..f811a3e 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -21,13 +21,14 @@ ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-e PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}" PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" -TUNE_PKGARCH ?= "${PPCPKGARCH}" # Basic tune definitions -AVAILTUNES += "powerpc powerpc-nf" +AVAILTUNES += "powerpc powerpc-nf" TUNE_FEATURES_tune-powerpc-nf ?= "m32 fpu-soft" +TUNE_PKGARCH_tune-powerpc-nf = "${PPCPKGARCH}" BASE_LIB_tune-powerpc-nf = "lib" PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf" TUNE_FEATURES_tune-powerpc ?= "m32 fpu-hard" +TUNE_PKGARCH_tune-powerpc = "${PPCPKGARCH}" BASE_LIB_tune-powerpc = "lib" PACKAGE_EXTRA_ARCHS_tune-powerpc = "powerpc"