From f71dc3bd77549744e234243c2a4288ab56724618 Mon Sep 17 00:00:00 2001
From: Lukc <lukc@upyum.com>
Date: Fri, 24 Dec 2010 09:03:56 +0100
Subject: Recette de binutils mise à jour et recette de gcc mise à jour.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 binutils/Pkgfile | 12 +++++++++---
 gcc/Pkgfile      | 15 +++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/binutils/Pkgfile b/binutils/Pkgfile
index 533e6d2..952b5f9 100644
--- a/binutils/Pkgfile
+++ b/binutils/Pkgfile
@@ -4,6 +4,11 @@ maintainer="Lukc <lukc AT upyum DOT com>"
 url="http://sources.redhat.com/binutils/"
 depends=(zlib)
 
+if [[ -z ${CROSS_TARGET} ]]; then
+	name=binutils
+else
+	name=binutils-$CROSS_TARGET
+fi
 name=binutils
 version=2.20.1
 release=1
@@ -14,13 +19,13 @@ build ()
 	sed -i '/^# RELEASE=y/s/#//' $name-$version/bfd/Makefile.in;
 	mkdir build;
 	cd build;
-	if [[ $CROSS_ARCH ]]; then
-		info "Building $name for $CROSS_ARCH."
+	if [[ -n $CROSS_TRIPLET ]]; then
+		info "Building $name for $CROSS_TRIPLET."
 	fi
 	../$name-$version/configure \
 		${CHOST:+--build=${CHOST}} \
 		${CTARGET:+--host=${CTARGET}} \
-		${CROSS_ARCH:+--target=${CROSS_ARCH}} \
+		${CROSS_TRIPLET:+--target=${CROSS_TRIPLET}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--enable-shared \
@@ -28,6 +33,7 @@ build ()
 	make tooldir=$prefix;
 	make check;
 	make tooldir=$prefix DESTDIR=$PKG install;
+	mkdir -p $PKG$prefix/include; # Pour éviter des problèmes…
 	cp ../$name-$version/include/libiberty.h $PKG$prefix/include;
 	# FIXME
 	if [[ -e $PKG$prefix/lib/libfd.la ]]; then
diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index 7026894..19fda52 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -1,10 +1,14 @@
-description="The GNU Compiler Collection"
+description="The GNU Compiler Collection."
 packager="CRUX System Team <core-ports AT crux DOT nu>"
 maintainer="Lukc <lukc AT upyum DOT com>"
 url="http://$name.gnu.org"
-depends=(zlib libmpc)
+depends=(binutils zlib libmpc)
 
-name=gcc
+if [[ -z ${CROSS_TARGET} ]]; then
+	name=gcc
+else
+	name=gcc-$CROSS_TARGET
+fi
 version=4.5.1
 release=1
 source=(
@@ -19,6 +23,9 @@ build ()
 	mkdir build;
 	cd build;
 	../$name-$version/configure \
+		${CHOST:+--build=${CHOST}} \
+		${CTARGET:+--host=${CTARGET}} \
+		${CROSS_TRIPLET:+--target=${CROSS_TRIPLET}} \
 		--prefix=$prefix \
 		--mandir=$mandir \
 		--libexecdir=$libdir \
@@ -41,5 +48,5 @@ build ()
 	mv $PKG$libdir/$name/*/$version/include-fixed/{limits.h,syslimits.h} $PKG$libdir/$name/*/$version/include/;
 	rm $PKG$libdir/{libiberty.a,libstdc++.so.6.0.14-gdb.py};
 	#rm -r $PKG$libdir/$name/*/$version/{install-tools,include-fixed};
-	sed -i "s|-L$SRC[^ ]* ||g" $PKG$libdir/{libstdc++.la,libsupc++.la}
+	sed -i "s|-L$SRC[^ ]* ||g" $PKG$libdir/{libstdc++.la,libsupc++.la} || true
 }
-- 
cgit v1.2.3-54-g00ecf