- updated gcc4 patch

- fixed build with latest automake
- -fPIC and SSP prevent grub from building, disabled

diff --git a/grub-am.patch b/grub-am.patch
new file mode 100644 (file)
index 0000000..d1527b5
--- /dev/null
+++ b/grub-am.patch
@@ -0,0 +1,48 @@
+--- grub-0.97/stage1/Makefile.am~      2004-07-16 13:44:56.000000000 +0200
++++ grub-0.97/stage1/Makefile.am       2014-01-26 19:30:31.468165604 +0100
+@@ -1,7 +1,7 @@
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+-nodist_pkglib_DATA = stage1
++pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++nodist_pkgdata_DATA = stage1
+ 
+-CLEANFILES = $(nodist_pkglib_DATA)
++CLEANFILES = $(nodist_pkgdata_DATA)
+ 
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+--- grub-0.97/stage2/Makefile.am~      2014-01-26 19:29:48.000000000 +0100
++++ grub-0.97/stage2/Makefile.am       2014-01-26 19:32:24.694831451 +0100
+@@ -28,12 +28,12 @@
+       -fno-strict-aliasing
+ 
+ # Stage 2 and Stage 1.5's.
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+ 
+ EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
+ 
+ if DISKLESS_SUPPORT
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+       ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+       reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
+       nbgrub pxegrub
+@@ -44,7 +44,7 @@
+       reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
+       xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
+ else
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+       ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+       reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
+ noinst_DATA = pre_stage2 start start_eltorito
+@@ -108,7 +108,7 @@
+ BUILT_SOURCES = stage2_size.h
+ endif
+ 
+-CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
++CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES)
+ 
+ stage2_size.h: pre_stage2
+       -rm -f stage2_size.h

diff --git a/grub-gcc4.patch b/grub-gcc4.patch
index cc9933ba941c3d57166d43134bcdce82c7ba6b1b..adc2156293e9290738861ec6167fd04e3ef8ce54 100644 (file)
--- a/grub-gcc4.patch
+++ b/grub-gcc4.patch
@@ -40,3 +40,23 @@
          /* wait */ ;
  
      if (currticks() >= to) {
+--- grub-0.97/netboot/sis900.c~        2014-01-26 20:00:16.000000000 +0100
++++ grub-0.97/netboot/sis900.c 2014-01-26 20:01:57.941485281 +0100
+@@ -901,7 +901,7 @@
+                 const char  *p)     /* Packet */
+ {
+     u32 status, to, nstype;
+-    u32 tx_status;
++    volatile u32 tx_status;
+     
+     /* Stop the transmitter */
+     outl(TxDIS, ioaddr + cr);
+@@ -940,7 +940,7 @@
+ 
+     to = currticks() + TX_TIMEOUT;
+ 
+-    while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to))
++    while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to))
+         /* wait */ ;
+ 
+     if (currticks() >= to) {

diff --git a/grub-pxe.patch b/grub-pxe.patch
index 779569ec13d66d639c4207ff4db7ad84aeec7a25..ec34a849cb3799bd543cc5926f0dc89cb361c548 100644 (file)
--- a/grub-pxe.patch
+++ b/grub-pxe.patch
@@ -48747,7 +48747,7 @@ Index: netboot/sis900.c
  {
 -    u32 status, to, nstype;
 +    u32 to, nstype;
-     u32 tx_status;
+     volatile u32 tx_status;
      
      /* Stop the transmitter */
 -    outl(TxDIS, ioaddr + cr);

diff --git a/grub.spec b/grub.spec
index 6dc932cc20ee73e911c006d23a4ccd69a0d201a5..d1145be0ea5b7d1a99d98dd95abac6b2fb04b224 100644 (file)
--- a/grub.spec
+++ b/grub.spec
@@ -40,6 +40,7 @@ Patch11:      %{name}-useless.patch
 Patch12:       %{name}-ac.patch
 Patch13:       %{name}-i2o.patch
 Patch14:       %{name}-pxe.patch
+Patch15:       %{name}-am.patch
 URL:           https://www.gnu.org/software/grub/grub-legacy.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -50,6 +51,7 @@ BuildRequires:        glibc-static
 BuildRequires: ncurses-static
 %endif
 %ifarch %{x8664}
+BuildRequires: gcc-multilib
 BuildRequires: /usr/lib/libc.a
 %endif
 # needed for 'cmp' program
@@ -59,6 +61,9 @@ Obsoletes:    fedora-logos
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _ssp_cflags     %{nil}
+%define                filterout       -fPIC
+
 %define                _sbindir        /sbin
 %define                _libdir         /boot
 
@@ -174,6 +179,7 @@ Wsparcie gruba dla rc-boot.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p0
+%patch15 -p1
 
 rm -rf doc/*info*