Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 21 years ago
parent
commit
eab5d1bf68
2 changed files with 2 additions and 38 deletions
  1. +0
    -36
      package/x86/grub/gcc34.patch
  2. +2
    -2
      package/x86/grub/grub.desc

+ 0
- 36
package/x86/grub/gcc34.patch

@ -1,36 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/x86/grub/gcc34.patch
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
===================================================================
RCS file: /cvsroot/grub/cvsroot/grub/grub/stage2/char_io.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- grub/stage2/char_io.c 2002/12/09 06:27:05 1.51
+++ grub/stage2/char_io.c 2004/03/27 17:02:54 1.52
@@ -1265,3 +1265,9 @@
return dest;
}
#endif /* ! STAGE1_5 */
+
+#ifndef GRUB_UTIL
+# undef memcpy
+/* GCC emits references to memcpy() for struct copies etc. */
+void *memcpy (void *dest, const void *src, int n) __attribute__ ((alias ("grub_memmove")));
+#endif

+ 2
- 2
package/x86/grub/grub.desc

@ -46,8 +46,8 @@
[L] GPL
[S] Stable
[V] 0.94
[V] 0.95
[P] X -?---5---9 202.200
[D] 2577767961 grub-0.94.tar.gz ftp://alpha.gnu.org/gnu/grub/
[D] 573949549 grub-0.95.tar.gz ftp://alpha.gnu.org/gnu/grub/

Loading…
Cancel
Save