Attachment #50317 for bug #80693

Lines 13-19 Link Here

(-)grub-0.96/grub/Makefile.am (-1 / +1 lines)
13	$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \	13	$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
14	-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib	14	-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
15		15
16	AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings	16	AM_CFLAGS = $(GRUB_CFLAGS)
17		17
18	grub_SOURCES = main.c asmstub.c	18	grub_SOURCES = main.c asmstub.c
19	grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)	19	grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)

Lines 185-191 Link Here

(-)grub-0.96/grub/Makefile.in (-1 / +1 lines)
185	$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \	185	$(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
186	-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib	186	-I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
187		187
188	AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings	188	AM_CFLAGS = $(GRUB_CFLAGS)
189	grub_SOURCES = main.c asmstub.c	189	grub_SOURCES = main.c asmstub.c
190	grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)	190	grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS)
191	all: all-am	191	all: all-am

Lines 24-31 Link Here

(-)grub-0.96/stage2/Makefile.am (-2 / +1 lines)
24	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \	24	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
25	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \	25	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
26	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \	26	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
27	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \	27	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
28	-fwritable-strings
29		28
30	# Stage 2 and Stage 1.5's.	29	# Stage 2 and Stage 1.5's.
31	pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)	30	pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)

Lines 579-586 Link Here

(-)grub-0.96/stage2/Makefile.in (-2 / +1 lines)
579	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \	579	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
580	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \	580	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
581	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \	581	-DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
582	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \	582	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
583	-fwritable-strings
584		583
585	@DISKLESS_SUPPORT_FALSE@pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \	584	@DISKLESS_SUPPORT_FALSE@pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
586	@DISKLESS_SUPPORT_FALSE@ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \	585	@DISKLESS_SUPPORT_FALSE@ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \

Return to bug 80693