packages: grub2/grub2.spec - "fix" efiemu on ac-amd64
glen
glen at pld-linux.org
Mon Jul 19 11:24:44 CEST 2010
Author: glen Date: Mon Jul 19 09:24:44 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- "fix" efiemu on ac-amd64
---- Files affected:
packages/grub2:
grub2.spec (1.80 -> 1.81)
---- Diffs:
================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.80 packages/grub2/grub2.spec:1.81
--- packages/grub2/grub2.spec:1.80 Mon Jul 19 10:52:53 2010
+++ packages/grub2/grub2.spec Mon Jul 19 11:24:38 2010
@@ -6,7 +6,14 @@
# Conditional build:
%bcond_with static # build static binaries
%bcond_without grubemu # build grub-emu binary
-#
+%bcond_without efiemu # build efiemu runtimes
+
+%if "%{cc_version}" < "3.4"
+# cc does not support:
+# cc1: sorry, unimplemented: code model `large' not supported yet
+%undefine with_efiemu
+%endif
+
Summary: GRand Unified Bootloader
Summary(de.UTF-8): GRUB2 - ein Bootloader für x86 und ppc
Summary(hu.UTF-8): GRUB2 - rendszerbetöltő x86 és ppc gépekhez
@@ -191,6 +198,7 @@
--enable-grub-emu-sdl \
--enable-grub-emu-pci \
%endif
+ --%{!?with_efiemu:dis}%{?with_efiemu:en}able-efiemu \
BUILD_CFLAGS="$CFLAGS"
%{__make} -j1 \
BUILD_CFLAGS="$CFLAGS" \
@@ -295,9 +303,11 @@
%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/grub.cfg
%{_libexecdir}/*.lst
%{_libexecdir}/*.mod
+%if %{with efiemu}
%ifarch %{x8664}
%{_libexecdir}/efiemu*.o
%endif
+%endif
%ifarch %{ix86} %{x8664} sparc sparc64
%{_libexecdir}/boot.img
%{_libexecdir}/cdboot.img
@@ -338,6 +348,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.81 2010/07/19 09:24:38 glen
+- "fix" efiemu on ac-amd64
+
Revision 1.80 2010/07/19 08:52:53 glen
- builds with am 1:1.11.1-1, fails with 1.10-1, so bump BR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.80&r2=1.81&f=u
More information about the pld-cvs-commit
mailing list