Fix building with gcc2.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 57 insertions, 30 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index e5235148b6b1..e65cb6f1dede 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.44 2005/07/04 11:35:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.45 2005/07/24 13:43:10 azarah Exp $
+
+  24 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/grub-0.96-gcc2.patch, grub-0.96-r2.ebuild:
+  Fix building with gcc2.
 
   04 Jul 2005; Sven Wegener <swegener@gentoo.org> grub-0.95.20040823.ebuild,
   grub-0.96.ebuild, grub-0.96-r1.ebuild, grub-0.96-r2.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1fa1188fb8f6..3adaa04dbcec 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,41 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 929aa2e40adbfedc5f84d493af53bdeb ChangeLog 13839
+MD5 ffc7d940854b3789738f79ada45c9a94 grub-0.94-r2.ebuild 3721
+MD5 adcde4d1dce3d1e2ef2c466f860c6875 grub-0.93.20030118.ebuild 2539
+MD5 57b1ac06a99f01be2f0529ddae744349 grub-0.96.ebuild 4184
+MD5 81ff3c533676c996778973eb2d0bbe9a grub-0.96-r2.ebuild 5240
+MD5 265cdebdd7e789aa0f65ece937b6f3d9 grub-0.96-r1.ebuild 5102
+MD5 0db2c1935cf7f2ca214b3fcd736bcf8d grub-0.95.20040823.ebuild 4193
+MD5 589c75142bd2a41d9342de643e7b9438 ChangeLog 13968
+MD5 774d3294eb6bd4722df2a9fadaedd73f grub-0.94-r1.ebuild 3605
+MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
+MD5 b92fdfe0bf28aa2e4963bb15577d9c12 grub-0.92-r1.ebuild 2533
+MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
+MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
+MD5 3f141147f2ded9c02b300eaf8361f3d5 files/grub-0.96-r1-gcc4.patch 5568
+MD5 5c12894c0a8cfd4a46a67e631dd45804 files/grub-0.96-netboot-pic.patch 446
 MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
-MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139
-MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
-MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r2 131
-MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
-MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96 140
-MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r1 140
+MD5 3c201afcdacfff41b196d3d56ef07866 files/grub-0.96-gcc2.patch 573
+MD5 8082c035a4ba98d0935b6b045827fb2c files/grub-0.96-nxstack.patch 18920
+MD5 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529
 MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r2 140
+MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
+MD5 904c3dec402e5c7f0e62ab970dcdf5b2 files/grub-0.96-PIC.patch 1925
 MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
 MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479
-MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
-MD5 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529
-MD5 904c3dec402e5c7f0e62ab970dcdf5b2 files/grub-0.96-PIC.patch 1925
-MD5 e5978f58eb732289c47b1e0093db4e73 files/grub-0.96-bounced-checks.patch 505
-MD5 7c2804e6a538b2dbcbb851b9614424fd files/grub-0.96-gcc4.patch 6871
+MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r2 131
+MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r1 140
+MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96 140
+MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139
+MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
 MD5 3f3995353a0995c56d996d2218570160 files/grub-0.96-i2o-raid.patch 1597
-MD5 5c12894c0a8cfd4a46a67e631dd45804 files/grub-0.96-netboot-pic.patch 446
-MD5 8082c035a4ba98d0935b6b045827fb2c files/grub-0.96-nxstack.patch 18920
-MD5 3f141147f2ded9c02b300eaf8361f3d5 files/grub-0.96-r1-gcc4.patch 5568
+MD5 7c2804e6a538b2dbcbb851b9614424fd files/grub-0.96-gcc4.patch 6871
 MD5 fb0f1b7cf2bf8055ee45f1e44c793cb7 files/grub-0.96-xfs-writable-string.patch 519
-MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
-MD5 b92fdfe0bf28aa2e4963bb15577d9c12 grub-0.92-r1.ebuild 2533
-MD5 adcde4d1dce3d1e2ef2c466f860c6875 grub-0.93.20030118.ebuild 2539
-MD5 774d3294eb6bd4722df2a9fadaedd73f grub-0.94-r1.ebuild 3605
-MD5 ffc7d940854b3789738f79ada45c9a94 grub-0.94-r2.ebuild 3721
-MD5 0db2c1935cf7f2ca214b3fcd736bcf8d grub-0.95.20040823.ebuild 4193
-MD5 265cdebdd7e789aa0f65ece937b6f3d9 grub-0.96-r1.ebuild 5102
-MD5 7d47e58514f036f557dd4e37f60c9f95 grub-0.96-r2.ebuild 5177
-MD5 57b1ac06a99f01be2f0529ddae744349 grub-0.96.ebuild 4184
-MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
+MD5 e5978f58eb732289c47b1e0093db4e73 files/grub-0.96-bounced-checks.patch 505
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCyR8rI1lqEGTUzyQRAuwqAJ49G+/vwuxvKLjeblJ8+ZYpJgkP3wCgk+MO
-DdwOCI/TH0m8G5v/fqPW/R8=
-=+nLB
+iD8DBQFC45uh1ZcsMnZjRyIRAleNAJ9PZ1WLl20MruC3lrzGbG1LbdxooACePACk
+QJl2TdmqvwbX0KVbhFPMAus=
+=kfgB
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-0.96-gcc2.patch b/sys-boot/grub/files/grub-0.96-gcc2.patch
new file mode 100644
index 000000000000..5600fb62b46d
--- /dev/null
+++ b/sys-boot/grub/files/grub-0.96-gcc2.patch
@@ -0,0 +1,19 @@
+--- grub-0.96/stage2/builtins.c	2005-07-24 15:46:56 +0200
++++ grub-0.96.az/stage2/builtins.c	2005-07-24 15:47:40 +0200
+@@ -2012,14 +2012,14 @@
+   int is_open = 0;
+   /* If LBA is forced?  */
+   int is_force_lba = 0;
+-
+-  *stage2_first_buffer = old_sect + SECTOR_SIZE;
+ #ifdef GRUB_UTIL
+   /* If the Stage 2 is in a partition mounted by an OS, this will store
+      the filename under the OS.  */
+   char *stage2_os_file = 0;
+ #endif /* GRUB_UTIL */
+ 
++  *stage2_first_buffer = old_sect + SECTOR_SIZE;
++
+   /* First, check the GNU-style long option.  */
+   while (1)
+     {
diff --git a/sys-boot/grub/grub-0.96-r2.ebuild b/sys-boot/grub/grub-0.96-r2.ebuild
index 648bdf3fdafd..39523f3f45bb 100644
--- a/sys-boot/grub/grub-0.96-r2.ebuild
+++ b/sys-boot/grub/grub-0.96-r2.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/sys-boot/grub/grub-0.96-r2.ebuild,v 1.4 2005/07/04 11:35:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.5 2005/07/24 13:43:10 azarah Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -67,6 +67,9 @@ src_unpack() {
 	# fix PIC issues in netboot code #85566
 	epatch "${FILESDIR}"/${P}-netboot-pic.patch
 
+	# fix building with gcc2
+	epatch "${FILESDIR}"/${P}-gcc2.patch
+
 	# a bunch of patches apply to raw autotool files
 	autoconf || die "autoconf failed"
 	aclocal || die "aclocal failed"