Author: glen Date: Mon Jul 19 19:24:10 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- ac-ppc fixes
---- Files affected:
packages/grub2:
grub2.spec (1.81 -> 1.82) , ppc.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.81 packages/grub2/grub2.spec:1.82
--- packages/grub2/grub2.spec:1.81 Mon Jul 19 11:24:38 2010
+++ packages/grub2/grub2.spec Mon Jul 19 21:24:04 2010
@@ -39,6 +39,7 @@
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
@@ -175,6 +176,7 @@
%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,,'
@@ -308,11 +310,11 @@
%{_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
@@ -348,6 +350,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.82 2010/07/19 19:24:04 glen
+- ac-ppc fixes
+
Revision 1.81 2010/07/19 09:24:38 glen
- "fix" efiemu on ac-amd64
================================================================
Index: packages/grub2/ppc.patch
diff -u /dev/null packages/grub2/ppc.patch:1.1
--- /dev/null Mon Jul 19 21:24:10 2010
+++ packages/grub2/ppc.patch Mon Jul 19 21:24:04 2010
@@ -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 */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.81&r2=1.82&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
