Submitted By: Uwe Düffert (lfs at uwe-dueffert dot de)
Date: 2004-05-13
Initial Package Version: 0.94
Origin: self-created, http://www.uwe-dueffert.de/lfs/patches/grub-0.94-gcc35-1.patch
Upstream Status: not reported
Description: fix compilation with gcc35
 
diff -Naur grub-0.94.orig/grub/Makefile.am grub-0.94/grub/Makefile.am
--- grub-0.94.orig/grub/Makefile.am	2004-05-13 15:53:52.970245904 +0000
+++ grub-0.94/grub/Makefile.am	2004-01-18 19:34:24.000000000 +0000
@@ -11,7 +11,7 @@
 	$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
 	-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
 
-AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings
+AM_CFLAGS = $(GRUB_CFLAGS)
 
 grub_SOURCES = main.c asmstub.c
 grub_LDADD = ../stage2/libgrub.a  ../lib/libcommon.a $(GRUB_LIBS)
diff -Naur grub-0.94.orig/grub/Makefile.in grub-0.94/grub/Makefile.in
--- grub-0.94.orig/grub/Makefile.in	2004-05-13 15:53:52.970245904 +0000
+++ grub-0.94/grub/Makefile.in	2004-01-18 19:44:44.000000000 +0000
@@ -152,7 +152,7 @@
 	-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
 
 
-AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings
+AM_CFLAGS = $(GRUB_CFLAGS)
 
 grub_SOURCES = main.c asmstub.c
 grub_LDADD = ../stage2/libgrub.a  ../lib/libcommon.a $(GRUB_LIBS)
diff -Naur grub-0.94.orig/stage2/Makefile.am grub-0.94/stage2/Makefile.am
--- grub-0.94.orig/stage2/Makefile.am	2004-05-13 15:53:52.915254264 +0000
+++ grub-0.94/stage2/Makefile.am	2003-10-19 16:45:18.000000000 +0000
@@ -23,7 +23,7 @@
 	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
 	-DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 \
 	-DFSYS_XFS=1 -DUSE_MD5_PASSWORDS=1 \
-	-DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings
+	-DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
 
 # Stage 2 and Stage 1.5's.
 pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
diff -Naur grub-0.94.orig/stage2/Makefile.in grub-0.94/stage2/Makefile.in
--- grub-0.94.orig/stage2/Makefile.in	2004-05-13 15:53:52.918253808 +0000
+++ grub-0.94/stage2/Makefile.in	2003-10-19 17:27:27.000000000 +0000
@@ -171,7 +171,7 @@
 	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
 	-DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 -DFSYS_VSTAFS=1 \
 	-DFSYS_XFS=1 -DUSE_MD5_PASSWORDS=1 \
-	-DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings
+	-DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
 
 
 EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec