[oe-commits] Andrea Adami : klibc: remove PACKAGE_ARCH = "${MACHINE_ARCH}"

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 89adc55282500a0600840251c8e5dc0ae2ea08d8
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=89adc55282500a0600840251c8e5dc0ae2ea08d8

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Tue Jun 14 00:14:08 2011 +0200

klibc: remove PACKAGE_ARCH = "${MACHINE_ARCH}"

* paraphrasing uclibc discussion:
* there is no good reason for klibc to be machine specific.
* remove local assignment to PACKAGE_ARCH so that it gets the default target
* architecture and bump INC_PR for that change.
*
* commit 09c194e7c38cf564b4948a711f81b671f87ae3a8 added it because
* "klibc fishes in kernel sources, and this is per-machine stuff, so
* klibc must be per-machine too. This is of course not ideal, as klibc is
* *not* machine-dependent, but at least it's on par with uclibc, which has
* the same issue."
*
* bump INC_PR

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>

---

 recipes/klibc/klibc.inc |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index c55ae2e..6840581 100644
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@ -5,8 +5,12 @@ use with initramfs.  It is deliberately written for small size, \
 minimal entaglement, and portability, not speed."
 LICENSE = "BSD-ADV"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-INC_PR = "r2"
+# We need to point to the kernel headers for ARCH but we don't want to become
+# machine specific so we use the headers staged for the current machine.
+# (was PACKAGE_ARCH = "${MACHINE_ARCH}")
+MACH_STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
+
+INC_PR = "r3"
 
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
@@ -43,11 +47,12 @@ SRC_URI += "\
 
 S = "${WORKDIR}/klibc-${PV}"
 
+
 EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
                 'CROSS_COMPILE=${TARGET_PREFIX}' \
-                'KLIBCKERNELSRC=${STAGING_KERNEL_DIR}' \
+                'KLIBCKERNELSRC=${MACH_STAGING_KERNEL_DIR}' \
                 "
 
 do_configure () {
-        ln -sf ${STAGING_KERNEL_DIR} linux
+        ln -sf ${MACH_STAGING_KERNEL_DIR} linux
 }