summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2009-09-15 19:41:02 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2009-09-15 19:41:02 +0000
commitafd5e250cd0875f8953ba940ebe9c8f864efdc18 (patch)
treec6e40eb0438c98b5743ec41f78ab916f1bdb71dd /dev-libs/klibc
parentEAPI=2; build when kde4 is installed (bug #274737) (diff)
downloadhistorical-afd5e250cd0875f8953ba940ebe9c8f864efdc18.tar.gz
historical-afd5e250cd0875f8953ba940ebe9c8f864efdc18.tar.bz2
historical-afd5e250cd0875f8953ba940ebe9c8f864efdc18.zip
Implement basic ARM support, thanks to the mv78100 board from Marvell.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/klibc')
-rw-r--r--dev-libs/klibc/ChangeLog5
-rw-r--r--dev-libs/klibc/Manifest4
-rw-r--r--dev-libs/klibc/klibc-1.5.15.ebuild18
3 files changed, 21 insertions, 6 deletions
diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 1eeaf96bc9d5..e800faa01b00 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/klibc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.68 2009/05/09 22:57:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.69 2009/09/15 19:41:02 robbat2 Exp $
+
+ 15 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> klibc-1.5.15.ebuild:
+ Implement basic ARM support, thanks to the mv78100 board from Marvell.
*klibc-1.5.15 (09 May 2009)
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index a25506d6296c..d56b5411b089 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -19,7 +19,7 @@ EBUILD klibc-1.1.ebuild 4163 RMD160 3bdee15ca33572451ff609634cf178ac3019f6e2 SHA
EBUILD klibc-1.5.11.ebuild 7057 RMD160 ae7d7d8cec09e9a1b787d2ea25b3501ebacd9d1e SHA1 f9d3f81fad94ba9f9ec6df2a02070f763b5cc314 SHA256 ca9c7f31dd9b9f13c57be6bdf1523cd8c626136d72bdfd5d3cb6550b427af314
EBUILD klibc-1.5.12-r1.ebuild 7750 RMD160 0ff4151f425e84fffdaeb98a75bf7ed1ca6c901e SHA1 29d41fbefbdc8a8f9394db94d0b966c60f33859a SHA256 9a397c65d02ae27e860488d8bbad445ffd360ff28454d4016f4fc24bb8223b57
EBUILD klibc-1.5.12.ebuild 7057 RMD160 847822e71e4669b8cf59eafb7ea89d7581d13bda SHA1 7c22d053ef05019e03f15add166b4acc2b60f1b6 SHA256 09ef34ed8ba11c9f6a84988286ed3190af2d5073d51231da1695283dbbf00f4c
-EBUILD klibc-1.5.15.ebuild 7824 RMD160 e12d7db6f4d8e7372412c250fb7af131c6832793 SHA1 6686f4076451670b277effdcb65eaa0a7066f179 SHA256 f5293829d7e81551044decf5fd3a86d2327e9ea60f2d960dce988eeb8b5a6dd6
+EBUILD klibc-1.5.15.ebuild 8176 RMD160 13fc506f90c140b46dffdef5c451076bf8b8e45a SHA1 838abc09c314511cec149fa745315a0814a418b2 SHA256 5bc08c0708e741d46847ab0726d2442bf99ed6ae5885463e0c90e28f4fdf0926
EBUILD klibc-1.5.8.ebuild 6920 RMD160 de5ba665e0baaa105d386bfd3242ea4036569385 SHA1 dc95c9e02959be2b2700d02f35659c8af140d148 SHA256 13bf15851856be9cf1f9bcdbfd48f8daf98efc72aac25f44de3b7b636e0aaf34
-MISC ChangeLog 11513 RMD160 27cf219df09652ef373437a85dcb78182eb43341 SHA1 26a83e01a2af99b630a579ef8748f1a6921bb7d5 SHA256 6acff8f357f8b1b79946c5fd595af407309e2d3f539ba6c90bce020ccf0c266f
+MISC ChangeLog 11661 RMD160 52f91daff9c461ae8cafc0c3567c8e42248a84ff SHA1 bee90893541270c25e215196db989f78f51bba13 SHA256 cf2e37eb682d26f642b9529a20024dc9372d6a7861645e3433b4938cde696410
MISC metadata.xml 257 RMD160 47ef62fe1bd58dc643105eb0ba428746e5a2e216 SHA1 94998abb1247fbef63eccd27d1544078e7f030bf SHA256 a8371994e2a3b1be202096fba4f9a6a86a85c1be2d5792a258730abe49513e9f
diff --git a/dev-libs/klibc/klibc-1.5.15.ebuild b/dev-libs/klibc/klibc-1.5.15.ebuild
index 6a2c2f599634..df93fb3c8944 100644
--- a/dev-libs/klibc/klibc-1.5.15.ebuild
+++ b/dev-libs/klibc/klibc-1.5.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.15.ebuild,v 1.1 2009/05/09 22:57:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.15.ebuild,v 1.2 2009/09/15 19:41:02 robbat2 Exp $
# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
# This still needs major work.
@@ -37,7 +37,7 @@ SRC_URI="
${KERNEL_URI}"
LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 -mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 -mips ~ppc ~sparc ~x86 ~arm"
SLOT="0"
IUSE="debug n32"
@@ -87,7 +87,7 @@ kernel_defconfig() {
case ${a} in
ppc64) echo ppc64_defconfig ;;
ppc) echo pmac32_defconfig ;;
- arm*|sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
+ sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
*) echo defconfig ;;
esac
}
@@ -136,6 +136,18 @@ src_compile() {
cd "${KS}"
emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" || die "No defconfig"
+ if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
+ [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
+ # The delete and insert are seperate statements
+ # so that they are reliably used.
+ sed -i \
+ -e '/CONFIG_AEABI/d' \
+ -e '1iCONFIG_AEABI=y' \
+ -e '/CONFIG_OABI_COMPAT/d' \
+ -e '1iCONFIG_OABI_COMPAT=y' \
+ "${KS}"/.config \
+ "${S}"/defconfig
+ fi
emake prepare CC="${CC}" HOSTCC="${HOSTCC}" || die "Failed to prepare kernel sources for header usage"
cd "${S}"