From f318af00b26b925ceda6743abcbfa869f7275f58 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 7 Feb 2013 14:21:57 +0100
Subject: [PATCH] cross-arm-linux-gnueabihf: make this build again.

---
 srcpkgs/cross-arm-linux-gnueabihf/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index ca7d4e95aa..7bc2be595a 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -7,7 +7,7 @@ _gmp_version=5.0.5
 _mpfr_version=3.1.1
 
 pkgname=cross-arm-linux-gnueabihf
-version=0.2
+version=0.3
 revision=1
 short_desc="Cross toolchain for the arm-linux-gnueabihf target"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -114,6 +114,7 @@ _glibc_headers() {
 		--host=${_CROSS_TARGET} --prefix=/usr \
 		--with-headers=/usr/${_CROSS_TARGET}/usr/include \
 		--config-cache --enable-add-ons=nptl,ports \
+		--enable-obsolete-rpc \
 		--enable-kernel=2.6.27 --with-float=hard || return 1
 
 	make -k install-headers cross_compiling=yes \
@@ -141,6 +142,7 @@ _glibc_build() {
 		--host=${_CROSS_TARGET} --prefix=/usr \
 		--with-headers=/usr/${_CROSS_TARGET}/usr/include \
 		--config-cache --enable-add-ons=nptl,ports \
+		--enable-obsolete-rpc --disable-profile \
 		--with-float=hard --enable-kernel=2.6.27
 	
 	make ${makejobs} || return 1
@@ -237,7 +239,9 @@ _gcc_final() {
 	ln -sfr ${_CROSS_SYSROOT}/usr/include/gnu/stubs-hard.h \
 		${_CROSS_SYSROOT}/usr/include/gnu/stubs-soft.h
 
-	export CC="gcc"
+	export CC="gcc" CFLAGS="-Os -pipe"
+	unset LD AS
+
 	# Make this link to target libs.
 	if [ ! -f .sed_subst_done ]; then
 		sed -e "s, /lib/, ${_CROSS_SYSROOT}/lib/,g;s, /usr/lib/, ${_CROSS_SYSROOT}/usr/lib/,g" \
@@ -293,6 +297,8 @@ do_build() {
 	for f in include lib libexec bin sbin; do
 		if [ ! -d ${_CROSS_SYSROOT}/usr/${f} ]; then
 			mkdir -p ${_CROSS_SYSROOT}/usr/${f}
+		fi
+		if [ ! -h ${_CROSS_SYSROOT}/${f} ]; then
 			ln -sfr ${_CROSS_SYSROOT}/usr/${f} ${_CROSS_SYSROOT}/${f}
 		fi
 	done
@@ -312,6 +318,8 @@ do_install() {
 	for f in include lib libexec bin sbin; do
 		if [ ! -d ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} ]; then
 			mkdir -p ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f}
+		fi
+		if [ ! -h ${DESTDIR}/${_CROSS_SYSROOT}/${f} ]; then
 			ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} \
 				${DESTDIR}/${_CROSS_SYSROOT}/${f}
 		fi