Bug #255271: check for IA32_EMULATION on 64-bit, as we are building a 32-bit binary and need to be able to run it.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 15 insertions, 3 deletions

diff --git a/sys-boot/grub-static/ChangeLog b/sys-boot/grub-static/ChangeLog
index e54e1736cd41..a66bb292b688 100644
--- a/sys-boot/grub-static/ChangeLog
+++ b/sys-boot/grub-static/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub-static
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.20 2009/05/15 21:12:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.21 2009/07/04 18:46:39 robbat2 Exp $
+
+  04 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  grub-static-0.97-r9.ebuild:
+  Bug #255271: check for IA32_EMULATION on 64-bit, as we are building a
+  32-bit binary and need to be able to run it.
 
   15 May 2009; Markus Meier <maekke@gentoo.org> grub-static-0.97-r9.ebuild:
   amd64 stable, bug #269201
diff --git a/sys-boot/grub-static/grub-static-0.97-r9.ebuild b/sys-boot/grub-static/grub-static-0.97-r9.ebuild
index 859b69f1bc2b..3844eac919bb 100644
--- a/sys-boot/grub-static/grub-static-0.97-r9.ebuild
+++ b/sys-boot/grub-static/grub-static-0.97-r9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.3 2009/05/15 21:12:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.4 2009/07/04 18:46:39 robbat2 Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
 #      we never updated any of the source code (it still all wants menu.lst),
 #      and there is no indication that upstream is making the transition.
 
-inherit eutils mount-boot
+inherit eutils mount-boot toolchain-funcs linux-info
 
 PATCHVER="1.9" # Not used, just for tracking with main grub
 
@@ -22,6 +22,13 @@ IUSE=""
 DEPEND="!sys-boot/grub"
 PROVIDE="virtual/bootloader"
 
+pkg_setup() {
+	local arch="$(tc-arch)"
+	case ${arch} in
+		amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
+	esac
+}
+
 src_install() {
 	cp -a "${WORKDIR}"/* "${D}"/
 }