Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4aa805d3f362ec0d1974c8a6ebebb7be37051bd
commit c4aa805d3f362ec0d1974c8a6ebebb7be37051bd
Author: Michel Hermier <herm...@frugalware.org>
Date: Sun Jun 21 13:01:03 2009 +0200
gcc-4.4.0-4-i686
* Correct splitting of of some file.
diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild
index 551aa63..2f0479b 100644
--- a/source/devel/gcc/FrugalBuild
+++ b/source/devel/gcc/FrugalBuild
@@ -199,12 +199,18 @@ build()
# symlinks for backward compatibility
Fln gcc /usr/bin/cc
+ Fmkdir /lib
+ Fln ../usr/bin/cpp /lib/cpp
+
if Fuse $USE_CPP; then
Fln g++ /usr/bin/c++
- Fmkdir /lib
- Fln ../usr/bin/cpp /lib/cpp
fi
- Fuse $USE_JAVA && Fln ../lib/gcc/$CHOST/$pkgver/include/jni.h
/usr/include/
+
+ if Fuse $USE_JAVA; then
+ Fln ../lib/gcc/$CHOST/$pkgver/include/jni.h /usr/include/
+ Fln ../lib/gcc/$CHOST/$pkgver/include/jni_md.h /usr/include/
+ fi
+
Fuse $USE_FORTRAN && Fln gfortran /usr/bin/f95
if Fuse $USE_ADA; then
@@ -241,8 +247,10 @@ build()
Fuse $USE_SHARED && Fsplit libgcc usr/lib/libgcc_*
if Fuse $USE_CPP; 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
fi
if Fuse $USE_JAVA; then
## always do this java stuff before gnat because gnat splits with gnat*
@@ -258,8 +266,11 @@ build()
Fsplit libgcj-awt usr/include/c++/$pkgver/sun/awt
# libgcj
## org, sun are libgcj includes also
+ Fsplit libgcj usr/include/{jni.h,jni_md.h}
Fsplit libgcj usr/include/c++/$pkgver/[gj]*
Fsplit libgcj usr/include/c++/$pkgver/{sun,org}
+ Fsplit libgcj usr/lib/gcc/$CHOST/$pkgver/include/gcj/
+ Fsplit libgcj
usr/lib/gcc/$CHOST/$pkgver/include/{jni.h,jni_md.h,jvmpi.h}
Fsplit libgcj usr/lib/pkgconfig/libgcj-${pkgver%.*}.pc
## maybe we should add some libgcj-tools or libgcj-utils package ? - crazy -
Fsplit libgcj
usr/bin/{jv-convert,gij,gjar,grmi*,gcj-dbtool,gorbd,gappletviewer,gjarsigner,gkeytool}
@@ -296,6 +307,8 @@ build()
fi
if Fuse $USE_FORTRAN; then
# libgfortran
+ Fsplit libgfortran usr/lib/gcc/$CHOST/$pkgver/finclude/omp_lib*
+ Fsplit libgfortran usr/lib/gcc/$CHOST/$pkgver/libgfortranbegin.*
Fsplit libgfortran usr/lib/libgfortran.*
# gcc-gfortran
Fsplit gcc-gfortran usr/bin/{gfortran,$CHOST-gfortran,f95}
@@ -305,6 +318,7 @@ build()
fi
if Fuse $USE_OBJC; then
# libobjc
+ Fsplit libobjc usr/lib/gcc/$CHOST/$pkgver/include/objc/
Fsplit libobjc usr/lib/libobjc*
# gcc-objc
Fsplit gcc-objc usr/libexec/gcc/$CHOST/$pkgver/cc1obj
@@ -323,6 +337,7 @@ build()
Fsplit libssp usr/lib/gcc/$CHOST/$pkgver/include/ssp/
# libgomp
Fsplit libgomp usr/info/libgomp.info
+ Fsplit libgomp usr/lib/gcc/$CHOST/$pkgver/include/omp.h
Fsplit libgomp usr/lib/libgomp.*
fi
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
