From d619c914013368ae3d3edee1f0b29a57fdc93437 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 13 Jul 2013 08:49:53 +0200
Subject: [PATCH] cross-arm-linux-musleabi: update toolchain components.

gcc -> 4.7.3
mpfr -> 3.1.2
musl -> 0.9.11
---
 .../files/musl-fix-arm-shlibs.patch           | 33 -------------------
 srcpkgs/cross-arm-linux-musleabi/template     | 24 +++++++-------
 2 files changed, 11 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/cross-arm-linux-musleabi/files/musl-fix-arm-shlibs.patch

diff --git a/srcpkgs/cross-arm-linux-musleabi/files/musl-fix-arm-shlibs.patch b/srcpkgs/cross-arm-linux-musleabi/files/musl-fix-arm-shlibs.patch
deleted file mode 100644
index 030fdf1a2ff..00000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/musl-fix-arm-shlibs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d432b2c057fc64256645422382c2f7e32c45b3cc Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Sun, 03 Feb 2013 06:26:33 +0000
-Subject: fix regression that made shared libs crash on arm
-
----
-diff --git a/crt/arm/crti.s b/crt/arm/crti.s
-index 2f658b7..35ae6ae 100644
---- crt/arm/crti.s
-+++ crt/arm/crti.s
-@@ -5,6 +5,8 @@ _init:
- 
- .weak __fini_array_start
- .weak __fini_array_end
-+.hidden __fini_array_start
-+.hidden __fini_array_end
- 
- .section .fini
- .global _fini
-diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s
-index 928e068..eb0e883 100644
---- crt/arm/crtn.s
-+++ crt/arm/crtn.s
-@@ -1,5 +1,7 @@
- .weak __init_array_start
- .weak __init_array_end
-+.hidden __init_array_start
-+.hidden __init_array_end
- 
- .section .init
- 	adr lr, 1f
---
-cgit v0.9.0.3-65-g4555
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index dd5a74db551..6080407a3e4 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,19 +1,19 @@
 # Template build file for 'cross-arm-linux-musleabi'
 #
 _binutils_version=2.23.1
-_gcc_version=4.7.2
-_musl_version=0.9.9
+_gcc_version=4.7.3
+_musl_version=0.9.11
 _gmp_version=5.0.5
-_mpfr_version=3.1.1
+_mpfr_version=3.1.2
 _mpc_version=0.9
 _linux_version=3.7.1
 
 _triplet=arm-linux-musleabi
-_fpuflags="--with-float=hard"
+_fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 
 pkgname=cross-${_triplet}
-version=0.2
+version=0.3
 revision=1
 short_desc="Cross toolchain for the ${_triplet} LE Hard Float target"
 maintainer="Juan RP <xtraeme@gmail.org>"
@@ -29,16 +29,15 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
- 8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084
+ 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
  1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
- 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd
+ 79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
  fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
  e1ca8b8376ebdf797357f5f1734ed6eed3cadc16c32d280a780f150372de7255
- 91f67d4e1e696df344c93b46bfcb1f6ad6d820e6ae544e3673f496e2d308f492"
+ 8b81fd9b71becb7b674ea93fd65d82a039fab79ab738957a5e9ee47ba08a13fd"
 
 create_wrksrc=yes
-disable_debug=yes
-makedepends="perl flex"
+hostmakedepends="perl flex"
 
 _CROSS_TARGET=${_triplet}
 _CROSS_SYSROOT="/usr/${_CROSS_TARGET}"
@@ -127,7 +126,6 @@ _musl_build() {
 
 	cd ${wrksrc}/musl-${_musl_version}
 	msg_normal "Building cross musl libc\n"
-	_apply_patch ${FILESDIR}/musl-fix-arm-shlibs.patch
 	
 	CC="${_CROSS_TARGET}-gcc" CFLAGS="-Os -pipe ${_archflags}" \
 		./configure --prefix=/usr \
@@ -236,7 +234,7 @@ do_clean() {
 }
 
 cross-arm-linux-musleabi-libc_package() {
-	short_desc="${short_desc} -- libc files"
+	short_desc+=" - libc files"
 	noarch=yes
 	noverifydeps=yes
 	pkg_install() {
@@ -248,6 +246,6 @@ cross-arm-linux-musleabi_package() {
 	nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 	depends="${pkgname}-libc-${version}_${revision}"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }