summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2008-02-08 22:47:02 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-02-08 22:47:02 +0000
commitb6764cf32ec93547531130dca364fb95e1c495f4 (patch)
treee9c383d07665201bc9516adcc352707b848f3df3 /packages
parentb86c63f95366d6f87975671a0d6da8e10107aabb (diff)
klibc: make changes so that klibc-utils-static compiles for eabi as well. Closes 3745.
Diffstat (limited to 'packages')
-rw-r--r--packages/klibc/files/klibc-config-eabi.patch9
-rw-r--r--packages/klibc/klibc-utils-static_1.5.bb12
2 files changed, 12 insertions, 9 deletions
diff --git a/packages/klibc/files/klibc-config-eabi.patch b/packages/klibc/files/klibc-config-eabi.patch
new file mode 100644
index 0000000000..86517f0594
--- /dev/null
+++ b/packages/klibc/files/klibc-config-eabi.patch
@@ -0,0 +1,9 @@
+diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig
+--- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100
+@@ -5,4 +5,4 @@
+ CONFIG_REGPARM=y
+ # ARM options
+ # CONFIG_KLIBC_THUMB is not set
+-# CONFIG_AEABI is not set
++CONFIG_AEABI=y
diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb
index 17db23305d..bbb3248158 100644
--- a/packages/klibc/klibc-utils-static_1.5.bb
+++ b/packages/klibc/klibc-utils-static_1.5.bb
@@ -4,6 +4,9 @@ PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
+SRC_URI_append_linux-gnueabi = "\
+ file://klibc-config-eabi.patch;patch=1"
+
EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
'CROSS_COMPILE=${TARGET_PREFIX}' \
"
@@ -36,7 +39,6 @@ do_install() {
install -m 755 usr/utils/static/uname ${D}${base_bindir}
}
-PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGES = "klibc-utils-static-sh klibc-utils-static-gzip \
klibc-utils-static-cat klibc-utils-static-chroot \
klibc-utils-static-cpio klibc-utils-static-dd \
@@ -71,11 +73,3 @@ FILES_klibc-utils-static-sleep = "${base_bindir}/sleep"
FILES_klibc-utils-static-true = "${base_bindir}/true"
FILES_klibc-utils-static-umount = "${base_bindir}/umount"
FILES_klibc-utils-static-uname = "${base_bindir}/uname"
-
-# the klibc code contains ARM instructions (for ARM), this
-# could be fixed, but for the moment:
-ARM_INSTRUCTION_SET = "arm"
-
-KLIBC_ARCH = "'${TARGET_ARCH}'"
-KLIBC_ARCH_armeb = "'arm'"
-KLIBC_ARCH_mipsel = "'mips'"