From 699366bdc1ddd36c1247fd562fa6ce853518b92b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 18 Oct 2009 12:28:15 +0200
Subject: [PATCH] binutils, gcc: create usr/lib -> usr/lib64 symlink for
 x86_64.

Based on patch contributed by ojab at
https://bugs.launchpad.net/xbps/+bug/453754

--HG--
extra : convert_revision : d7de7ee4bd3e34bfa89e3a2148359f336a372797
---
 templates/binutils/template |  8 ++++++++
 templates/gcc/template      | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/templates/binutils/template b/templates/binutils/template
index d531b09c8b7..76a2828bd16 100644
--- a/templates/binutils/template
+++ b/templates/binutils/template
@@ -26,6 +26,14 @@ base_chroot=yes
 subpackages="devel"
 Add_dependency run glibc
 
+pre_install()
+{
+	if [ "$xbps_machine" = "x86_64" ]; then
+		mkdir -vp ${DESTDIR}/usr/lib
+		cd ${DESTDIR}/usr/lib && ln -sv lib lib64 && cd ${wrksrc}
+	fi
+}
+
 post_install()
 {
 	# Remove info file that conflicts with autoconf.
diff --git a/templates/gcc/template b/templates/gcc/template
index f37d13f533f..a955fca31b1 100644
--- a/templates/gcc/template
+++ b/templates/gcc/template
@@ -1,8 +1,7 @@
 # Template build file for 'gcc'
 pkgname=gcc
 version=4.4.1
-distfiles="
-http://ftp.gnu.org/pub/gnu/gcc/$pkgname-$version/$pkgname-$version.tar.bz2"
+distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-clocale=gnu --disable-bootstrap
  --enable-threads=posix --enable-__cxa_atexit --disable-multilib
@@ -33,6 +32,14 @@ pre_configure()
 	sed -i 's/install_to_$(INSTALL_DEST) //' $wrksrc/libiberty/Makefile.in
 }
 
+pre_install()
+{
+	if [ "$xbps_machine" = "x86_64" ]; then
+		mkdir -vp ${DESTDIR}/usr/lib
+		cd ${DESTDIR}/usr/lib && ln -sv lib lib64 && cd ${wrksrc}
+	fi
+}
+
 post_install()
 {
 	cd ${DESTDIR}/usr/bin && ln -s gcc cc