Fix to build with gcc-4.0.0.

Package-Manager: portage-2.0.51.20-r4

4 files changed, 39 insertions, 10 deletions

diff --git a/dev-util/guile/ChangeLog b/dev-util/guile/ChangeLog
index fbdea7868e28..e2a6ae488c74 100644
--- a/dev-util/guile/ChangeLog
+++ b/dev-util/guile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/guile
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/ChangeLog,v 1.39 2005/04/06 20:20:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/ChangeLog,v 1.40 2005/04/24 15:51:01 azarah Exp $
+
+  24 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/guile-1.6.7-gcc4.patch, guile-1.6.7.ebuild:
+  Fix to build with gcc-4.0.0.
 
   06 Apr 2005; Seemant Kulleen <seemant@gentoo.org> guile-1.6.4-r1.ebuild,
   guile-1.6.6.ebuild, guile-1.6.7.ebuild:
diff --git a/dev-util/guile/Manifest b/dev-util/guile/Manifest
index a028b0414771..0f82c48e6b21 100644
--- a/dev-util/guile/Manifest
+++ b/dev-util/guile/Manifest
@@ -1,16 +1,27 @@
-MD5 327369d7f77a3211382c3d8f3cc2eba5 metadata.xml 313
-MD5 f4a3bb08da3e9162271dee410addc833 guile-1.4-r3.ebuild 786
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6c96ba5979bf0f56d6d04c90de9e0208 guile-1.4.1.ebuild 818
 MD5 eac249d9efd570c8e59e37ae1a6c5a49 guile-1.6.4-r1.ebuild 1920
+MD5 77b8d50db46fb3af3883a34e14ec08ff ChangeLog 5471
+MD5 f4a3bb08da3e9162271dee410addc833 guile-1.4-r3.ebuild 786
+MD5 327369d7f77a3211382c3d8f3cc2eba5 metadata.xml 313
 MD5 0d9318a760c6bf3f32beccf5f5b5c81f guile-1.6.6.ebuild 2067
-MD5 8cc596a43275b55ac538beeda0fa643e guile-1.6.7.ebuild 2179
-MD5 0d73e1ebf7b75ed213ff29aaa3f02798 ChangeLog 5335
-MD5 983ca0d7ff0dc5899a453df89e714538 files/digest-guile-1.4-r3 62
+MD5 f7f173a2b7c79ece37c49df2d9aff76e guile-1.6.7.ebuild 2232
 MD5 c8ef00401b82bbfae1fa78785341e8dc files/digest-guile-1.6.4-r1 64
-MD5 0cd979c8cd8e7667986b79db8ccae209 files/guile-macos-posix.patch 904
-MD5 c6e6b728591d901172031cc9a0997d31 files/digest-guile-1.4.1 64
-MD5 cd2f121bfb660c3ae7ba916a07d086f7 files/digest-guile-1.6.7 64
+MD5 983ca0d7ff0dc5899a453df89e714538 files/digest-guile-1.4-r3 62
 MD5 979d4686f6e39379b33139182873dead files/guile-amd64.patch 439
+MD5 c6e6b728591d901172031cc9a0997d31 files/digest-guile-1.4.1 64
+MD5 a162d311d2487b57ea35eb452b2ad5d1 files/guile-1.6.7-gcc4.patch 483
+MD5 0cd979c8cd8e7667986b79db8ccae209 files/guile-macos-posix.patch 904
 MD5 d97c8dff01a8b6735f8bef03c72f52f3 files/guile-macos-relink.patch 1213
 MD5 421beec2399dd47b6cc14d5691d7dcc4 files/guile-1.4-inet_aton.patch 624
 MD5 30c55437dd6efe1474a4f4312228b2ca files/digest-guile-1.6.6 64
+MD5 cd2f121bfb660c3ae7ba916a07d086f7 files/digest-guile-1.6.7 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCa8Fy1ZcsMnZjRyIRAvwbAJ4yKhRtqmcoS4FeYZvn/UhBMhkN3gCfXXjw
+yRwdS8N3PkRZUuPzckzHbMw=
+=rP0Z
+-----END PGP SIGNATURE-----
diff --git a/dev-util/guile/files/guile-1.6.7-gcc4.patch b/dev-util/guile/files/guile-1.6.7-gcc4.patch
new file mode 100644
index 000000000000..6d2f18d5b156
--- /dev/null
+++ b/dev-util/guile/files/guile-1.6.7-gcc4.patch
@@ -0,0 +1,11 @@
+--- guile-1.6.7/libguile/guile.c	2002-12-07 22:41:32.000000000 +0000
++++ guile-1.6.7.az/libguile/guile.c	2005-04-24 15:43:21.000000000 +0000
+@@ -88,7 +88,7 @@
+ {
+ #ifdef DYNAMIC_LINKING
+   /* libtool automagically inserts this variable into your executable... */
+-  extern const scm_lt_dlsymlist lt_preloaded_symbols[];
++  extern const scm_lt_dlsymlist *lt_preloaded_symbols;
+   scm_lt_dlpreload_default (lt_preloaded_symbols);
+ #endif
+   scm_boot_guile (argc, argv, inner_main, 0);
diff --git a/dev-util/guile/guile-1.6.7.ebuild b/dev-util/guile/guile-1.6.7.ebuild
index 310b8b8ea455..2395e80bf210 100644
--- a/dev-util/guile/guile-1.6.7.ebuild
+++ b/dev-util/guile/guile-1.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.6.7.ebuild,v 1.3 2005/04/07 04:06:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.6.7.ebuild,v 1.4 2005/04/24 15:51:01 azarah Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -43,6 +43,9 @@ src_unpack() {
 		epatch ${FILESDIR}/guile-macos-posix.patch
 		epatch ${FILESDIR}/guile-macos-relink.patch
 	fi
+
+	# Fix for gcc-4.0
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
 
 src_compile() {