Updated gcc-3.4.3-r1 for more libffi fixes - moved headers to locations that worked...

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index bca8d7dcb03d6173dfd0ad469c8b4d14e99457c5..f948cc99ccc434538f53ae41119a2cf6bae5f788 100644 (file)
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -10,7 +10,7 @@ MD5 b51ad5b522016590a155af2ab03f4e20 gcc-3.4.2-r2.ebuild 13458
 MD5 453632339c41cdb4c4a6949c282556e2 gcc-3.4.3.ebuild 13325
 MD5 4bcf46d8a3f5509cf09f23017408095d gcc-2.95.3-r8.ebuild 8407
 MD5 872c3e4633f5a8414f8e2c004fa3b374 gcc-3.3.3-r3.ebuild 23468
-MD5 1f9bd717a591da1b1a937d6f69d71070 gcc-3.4.3-r1.ebuild 13858
+MD5 4282c4d5c156752df0976947871f7e1e gcc-3.4.3-r1.ebuild 14494
 MD5 5bdc72e6f0fedd6b932d93692a4e4fa6 ChangeLog 74977
 MD5 483487724c94691b62abeb1a32023e9e gcc-3.3.2.ebuild 16758
 MD5 b52666d9d366f9dd02c00cdedb65b281 gcc-3.3.4-r2.ebuild 24553

diff --git a/sys-devel/gcc/gcc-3.4.3-r1.ebuild b/sys-devel/gcc/gcc-3.4.3-r1.ebuild
index 4061953388f336d787978d5e3ee6fad70ba2b8a2..2256c752db4b302542cfe9c8e260f800480d971e 100644 (file)
--- a/sys-devel/gcc/gcc-3.4.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3-r1.ebuild,v 1.3 2004/11/29 00:28:58 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3-r1.ebuild,v 1.4 2004/11/29 05:47:11 fafhrd Exp $
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
@@ -360,6 +360,18 @@ src_install() {
                exeinto /sbin
                doexe ${FILESDIR}/fix_libtool_files.sh
        fi
+
+       # I do not know if this will break gcj stuff, so I'll only do it for
+       #   objc for now; basically "ffi.h" is the correct file to include,
+       #   but it gets installed in .../GCCVER/include and yet it does 
+       #   "#include <ffitarget.h>" which (correctly, as it's an "extra" file)
+       #   is installed in .../GCCVER/include/libffi; the following fixes
+       #   ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
+       if use objc && ! use gcj; then
+               #dosed "s:<ffitarget.h>:<libffi/ffitarget.h>:g" /${LIBPATH}/include/ffi.h
+               mv ${D}/${LIBPATH}/include/libffi/* ${D}/${LIBPATH}/include
+               rm -Rf ${D}/${LIBPATH}/include/libffi
+       fi
 }
 
 fix_freaky_non_versioned_library_paths_that_dont_ever_get_used() {