Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=b45c79d79d0a0cfde370a7354a2f75b10f9b2c95
commit b45c79d79d0a0cfde370a7354a2f75b10f9b2c95
Author: crazy <[EMAIL PROTECTED]>
Date: Sun Mar 9 15:36:14 2008 +0100
gcc-4.3.0-2-i686
* fix 64bit multilib crap
* added an extra check to move the libs if
* they still install in lib64 for some reason
diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild
index e341e8c..df8419a 100644
--- a/source/devel/gcc/FrugalBuild
+++ b/source/devel/gcc/FrugalBuild
@@ -68,7 +68,7 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686
x86_64' 'i686 x86_64'
build()
{
- Fsed '../lib64 ../lib' '. ../lib' gcc/config/i386/t-linux64
+ Fsed 'lib64' 'lib' gcc/config/i386/t-linux64
# no fixincludes, thanks
Fsed '\./fixinc\.sh' '-c true' gcc/Makefile.in
# fix for newer xulrunner
@@ -115,6 +115,12 @@ build()
unset MAKEFLAGS #this is needed by libffi
Fmakeinstall
+
+ if [ -d $Fdestdir/usr/lib64 ]; then
+ Fmessage "Killing multilib CRAP!"
+ mv -f $Fdestdir/usr/lib64/* $Fdestdir/usr/lib/ || Fdie
+ rm -rf $Fdestdir/usr/lib64 || Fdie
+ fi
# fix some junk in la files
for lafile in `find $Fdestdir -name "*.la"`
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
