[oe-commits] org.oe.dev klibc: make changes so that klibc-utils-static compiles for eabi as well. Closes 3745.

[thesing commit]

klibc: make changes so that klibc-utils-static compiles for eabi as well.  Closes 3745.

Author: thesing
Branch: org.openembedded.dev
Revision: 2d7114b5bd553a86afdf241ba00411ba1e6d9bec
ViewMTN: http://monotone.openembedded.org/revision/info/2d7114b5bd553a86afdf241ba00411ba1e6d9bec
Files:
1
packages/klibc/files/klibc-config-eabi.patch
packages/klibc/klibc-utils-static_1.5.bb
Diffs:

#
# mt diff -r806628864aa4889205fdabd7ea9d9029d6b76060 -r2d7114b5bd553a86afdf241ba00411ba1e6d9bec
#
# 
# 
# add_file "packages/klibc/files/klibc-config-eabi.patch"
#  content [9ce82e5d2cc7597ec66f40fd0abe36685b998028]
# 
# patch "packages/klibc/klibc-utils-static_1.5.bb"
#  from [41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f]
#    to [0aeaa25067f4778c45bbbd7ec34c5031db9f1f12]
# 
============================================================
--- packages/klibc/files/klibc-config-eabi.patch	9ce82e5d2cc7597ec66f40fd0abe36685b998028
+++ packages/klibc/files/klibc-config-eabi.patch	9ce82e5d2cc7597ec66f40fd0abe36685b998028
@@ -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
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb	41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f
+++ packages/klibc/klibc-utils-static_1.5.bb	0aeaa25067f4778c45bbbd7ec34c5031db9f1f12
@@ -1,9 +1,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 require klibc-common.inc
 
 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-uname = "${base
 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'"