From 45d0dac16ad84f9eb0264dfd662238e3913619d6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 17 Jul 2008 20:40:34 +0000 Subject: bitbake.conf/tune.conf: Set BASE_PACKAGE_ARCH and build PACKAGE_ARCH from this git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4857 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/bitbake.conf | 3 ++- meta/conf/machine/include/tune-arm1136jf-s.inc | 2 +- meta/conf/machine/include/tune-arm920t.inc | 2 +- meta/conf/machine/include/tune-arm926ejs.inc | 2 +- meta/conf/machine/include/tune-arm9tdmi.inc | 2 +- meta/conf/machine/include/tune-armv7.inc | 2 +- meta/conf/machine/include/tune-c3.inc | 2 +- meta/conf/machine/include/tune-cortexa8.inc | 2 +- meta/conf/machine/include/tune-cortexm1.inc | 2 +- meta/conf/machine/include/tune-cortexm3.inc | 2 +- meta/conf/machine/include/tune-cortexr4.inc | 2 +- meta/conf/machine/include/tune-ep9312.inc | 2 +- meta/conf/machine/include/tune-iwmmxt.inc | 2 +- meta/conf/machine/include/tune-ppc603e.inc | 2 +- meta/conf/machine/include/tune-ppce500.inc | 2 +- meta/conf/machine/include/tune-supersparc.inc | 2 +- meta/conf/machine/include/tune-xscale.inc | 2 +- 17 files changed, 18 insertions(+), 17 deletions(-) (limited to 'meta') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 74b593a03..ad85dc386 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -86,7 +86,8 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS' TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" -PACKAGE_ARCH = "${HOST_ARCH}" +BASE_PACKAGE_ARCH = "${HOST_ARCH}" +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc index 7a9a82104..be5aedc50 100644 --- a/meta/conf/machine/include/tune-arm1136jf-s.inc +++ b/meta/conf/machine/include/tune-arm1136jf-s.inc @@ -1,7 +1,7 @@ TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" TARGET_CC_ARCH += "${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]}" FEED_ARCH = "armv6" -PACKAGE_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc index b142d3325..1f7a04bb3 100644 --- a/meta/conf/machine/include/tune-arm920t.inc +++ b/meta/conf/machine/include/tune-arm920t.inc @@ -1,4 +1,4 @@ FEED_ARCH = "armv4t" -PACKAGE_ARCH = "armv4t" +BASE_PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc index c3e8d7aef..e80ef1049 100644 --- a/meta/conf/machine/include/tune-arm926ejs.inc +++ b/meta/conf/machine/include/tune-arm926ejs.inc @@ -4,4 +4,4 @@ FEED_ARCH = "armv5te" #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" # For gcc 4.x you need: TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" -PACKAGE_ARCH = "armv5te" +BASE_PACKAGE_ARCH = "armv5te" diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc index d097b0773..39e449301 100644 --- a/meta/conf/machine/include/tune-arm9tdmi.inc +++ b/meta/conf/machine/include/tune-arm9tdmi.inc @@ -1,2 +1,2 @@ -PACKAGE_ARCH = "armv4t" +BASE_PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/meta/conf/machine/include/tune-armv7.inc b/meta/conf/machine/include/tune-armv7.inc index 6276fe679..96c8c6490 100644 --- a/meta/conf/machine/include/tune-armv7.inc +++ b/meta/conf/machine/include/tune-armv7.inc @@ -3,4 +3,4 @@ # This will NOT compile programs in 'ARM' mode, which is what you really want TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc index e6a522af1..107341eb6 100644 --- a/meta/conf/machine/include/tune-c3.inc +++ b/meta/conf/machine/include/tune-c3.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=c3 -mtune=c3" -PACKAGE_ARCH = "i586" +BASE_PACKAGE_ARCH = "i586" diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc index 0133240de..f8ddfea71 100644 --- a/meta/conf/machine/include/tune-cortexa8.inc +++ b/meta/conf/machine/include/tune-cortexa8.inc @@ -6,4 +6,4 @@ TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" TARGET_CC_ARCH_pn-libxcursor = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" FEED_ARCH = "armv7a" -PACKAGE_ARCH = "armv7a" +BASE_PACKAGE_ARCH = "armv7a" diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/meta/conf/machine/include/tune-cortexm1.inc index a0d18b69c..6c4a70a24 100644 --- a/meta/conf/machine/include/tune-cortexm1.inc +++ b/meta/conf/machine/include/tune-cortexm1.inc @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv6" -PACKAGE_ARCH = "armv6" +BASE_PACKAGE_ARCH = "armv6" diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/meta/conf/machine/include/tune-cortexm3.inc index 3598998a7..6da9aeedd 100644 --- a/meta/conf/machine/include/tune-cortexm3.inc +++ b/meta/conf/machine/include/tune-cortexm3.inc @@ -1,4 +1,4 @@ # valid options for -march: `armv7', `armv7-m' TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/meta/conf/machine/include/tune-cortexr4.inc b/meta/conf/machine/include/tune-cortexr4.inc index 93c82e860..b8bb7f50a 100644 --- a/meta/conf/machine/include/tune-cortexr4.inc +++ b/meta/conf/machine/include/tune-cortexr4.inc @@ -1,4 +1,4 @@ # valid options for -march: `armv7', `armv7-r' TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" -PACKAGE_ARCH = "armv7" +BASE_PACKAGE_ARCH = "armv7" diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc index 0982cf2a1..2cfdf5270 100644 --- a/meta/conf/machine/include/tune-ep9312.inc +++ b/meta/conf/machine/include/tune-ep9312.inc @@ -2,5 +2,5 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" # add "-mfp=maverick" for newer gcc versions > 4.0 #set arch to ep9312 for all generated packages -PACKAGE_ARCH = "ep9312" +BASE_PACKAGE_ARCH = "ep9312" diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc index 8376faca7..49e560ea1 100644 --- a/meta/conf/machine/include/tune-iwmmxt.inc +++ b/meta/conf/machine/include/tune-iwmmxt.inc @@ -1,6 +1,6 @@ # Configurations for the Intel PXA27x Appications Processor Family. # Please use tune-xscale for PXA255/PXA26x based processors. TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" -PACKAGE_ARCH = "iwmmxt" +BASE_PACKAGE_ARCH = "iwmmxt" PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc index 1a004d30b..a4a68d60e 100644 --- a/meta/conf/machine/include/tune-ppc603e.inc +++ b/meta/conf/machine/include/tune-ppc603e.inc @@ -1,2 +1,2 @@ TARGET_CC_ARCH = "-mcpu=603e -mhard-float" -PACKAGE_ARCH = "ppc603e" +BASE_PACKAGE_ARCH = "ppc603e" diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc index 11717eba7..248219642 100644 --- a/meta/conf/machine/include/tune-ppce500.inc +++ b/meta/conf/machine/include/tune-ppce500.inc @@ -1,2 +1,2 @@ TARGET_CC_ARCH = "-mcpu=8540" -PACKAGE_ARCH = "ppce500" +BASE_PACKAGE_ARCH = "ppce500" diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc index 1b1ec1207..10133c6c2 100644 --- a/meta/conf/machine/include/tune-supersparc.inc +++ b/meta/conf/machine/include/tune-supersparc.inc @@ -1,2 +1,2 @@ TARGET_CC_ARCH = "-mcpu=supersparc" -PACKAGE_ARCH = "supersparc" +BASE_PACKAGE_ARCH = "supersparc" diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 4cb0b4f7c..fc6827c53 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc @@ -2,7 +2,7 @@ FEED_ARCH = "armv5te" TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" +BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" # webkit-gtk has alignment issues with double instructions on armv5 so # disable them here -- cgit v1.2.3