Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb31df37a25be8394da12a553605692232322141
commit eb31df37a25be8394da12a553605692232322141
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Jun 22 11:29:14 2009 +0200
gcc-4.4.0-5-i686
* Fix splitting order, some languages relies on the c++ compiler.
diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild
index 1e2c752..0acab99 100644
--- a/source/devel/gcc/FrugalBuild
+++ b/source/devel/gcc/FrugalBuild
@@ -243,25 +243,15 @@ build()
fi
# split the pkg
- # libgcc
- Fuse $USE_SHARED && Fsplit libgcc usr/lib/libgcc_*
- if Fuse $USE_CXX; then
- # libstdc++
- Fsplit libstdc++ usr/include/c++/
- Fsplit libstdc++ usr/lib/libstdc++.*
- Fsplit libstdc++ usr/man/man3/
- Fsplit libstdc++
usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- #gcc-g++
- Fsplit gcc-g++ usr/bin/{,$CHOST-}{c++,g++}
- Fsplit gcc-g++ usr/lib/libsupc++.*
- Fsplit gcc-g++ usr/libexec/gcc/$CHOST/$pkgver/cc1plus
- Fsplit gcc-g++ usr/man/man1/g++.1
- fi
if Fuse $USE_JAVA; then
## always do this java stuff before gnat because gnat splits with gnat*
## and we got now 'gnat'ive2ascii which is java stuff ;)
## NOTE: old gcj-${pkgver} is now gcj-${pkgver}-xx
gcjpkgver=$(basename $Fdestdir/usr/lib/gcj-${pkgver}*)
+ # libffi
+ Fsplit libffi usr/lib/libffi*
+ Fsplit libffi usr/lib/gcc/$CHOST/$pkgver/include/ffi*
+ Fsplit libffi usr/include/ffi*
# libgcj-awt
Fsplit libgcj-awt usr/lib/gcc/$CHOST/$pkgver/include/jawt*.h
Fsplit libgcj-awt usr/lib/${gcjpkgver}/lib{jawt,gcjwebplugin,gtkpeer}.*
@@ -330,13 +320,21 @@ build()
# gcc-objc++
Fsplit gcc-objc++ usr/libexec/gcc/$CHOST/$pkgver/cc1objplus
fi
- if Fuse $USE_JAVA; then
- # libffi
- Fsplit libffi usr/lib/libffi*
- Fsplit libffi usr/lib/gcc/$CHOST/$pkgver/include/ffi*
- Fsplit libffi usr/include/ffi*
+ if Fuse $USE_CXX; then
+ # libstdc++
+ Fsplit libstdc++ usr/include/c++/
+ Fsplit libstdc++ usr/lib/libstdc++.*
+ Fsplit libstdc++ usr/man/man3/
+ Fsplit libstdc++
usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+ #gcc-g++
+ Fsplit gcc-g++ usr/bin/{,$CHOST-}{c++,g++}
+ Fsplit gcc-g++ usr/lib/libsupc++.*
+ Fsplit gcc-g++ usr/libexec/gcc/$CHOST/$pkgver/cc1plus
+ Fsplit gcc-g++ usr/man/man1/g++.1
fi
if Fuse $USE_SHARED; then
+ # libgcc
+ Fsplit libgcc usr/lib/libgcc_*
# libssp
Fsplit libssp usr/lib/libssp*
Fsplit libssp usr/lib/gcc/$CHOST/$pkgver/include/ssp/
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
