- ac-ppc fixes

Changed files:
    grub2.spec -> 1.82
    ppc.patch -> 1.1

diff --git a/grub2.spec b/grub2.spec
index 7ec341ade1cbe86310d3b240a34b3b2865daff69..7ac9f082ad7bc125f609396698ba0e046fbc4fcf 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -38,6 +38,7 @@ Patch4:               grub-install.in.patch
 Patch5:                grub-lvmdevice.patch
 Patch6:                pld-mkconfigdir.patch
 Patch7:                grub-mkconfig-diagnostics.patch
+Patch8:                ppc.patch
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.11.1-1
 BuildRequires: bison
@@ -174,6 +175,7 @@ avançados e que querem mais recursos de seu boot loader.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %if "%{cc_version}" < "3.4"
 grep -rl -- -Wno-missing-field-initializers . | xargs sed -i -e 's,-Wno-missing-field-initializers,,'
@@ -307,11 +309,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/efiemu*.o
 %endif
 %endif
+%{_libexecdir}/kernel.img
 %ifarch %{ix86} %{x8664} sparc sparc64
 %{_libexecdir}/boot.img
 %{_libexecdir}/cdboot.img
 %{_libexecdir}/diskboot.img
-%{_libexecdir}/kernel.img
 %{_libexecdir}/lnxboot.img
 %{_libexecdir}/pxeboot.img
 %endif

diff --git a/ppc.patch b/ppc.patch
new file mode 100644 (file)
index 0000000..fde494c
--- /dev/null
+++ b/ppc.patch
@@ -0,0 +1,27 @@
+disable -m32 on ppc (gcc 3.3.6 does not like it)
+
+revert 'returns_twice' attribute for grub_setjmp.
+http://repo.or.cz/w/grub2.git/commitdiff/2c7825edcb18e9d0680a953f1475ef2caf6b0f0f
+
+--- grub-1.98/configure.ac~    2010-03-06 20:51:37.000000000 +0000
++++ grub-1.98/configure.ac     2010-07-19 13:59:46.468351205 +0000
+@@ -114,7 +114,7 @@
+ esac
+ 
+ case "$target_cpu" in
+-  i386 | powerpc) target_m32=1 ;;
++  i386) target_m32=1 ;;
+   x86_64 | sparc64) target_m64=1 ;;
+ esac
+ 
+--- grub-1.98/include/grub/powerpc/setjmp.h~   2010-03-06 20:51:37.000000000 +0000
++++ grub-1.98/include/grub/powerpc/setjmp.h    2010-07-19 16:37:03.616853413 +0000
+@@ -21,7 +21,7 @@
+ 
+ typedef unsigned long grub_jmp_buf[20];
+ 
+-int grub_setjmp (grub_jmp_buf env) __attribute__ ((returns_twice));
++int grub_setjmp (grub_jmp_buf env);
+ void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn));
+ 
+ #endif /* ! GRUB_SETJMP_CPU_HEADER */