summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-03-17 22:30:14 +0000
committerMike Gilbert <floppym@gentoo.org>2012-03-17 22:30:14 +0000
commit0836bc7ac1160a4f34f91535878b55a96e028a84 (patch)
tree9fb8ecdff1eced409574177f30f7303a4d1245c8 /sys-boot
parentalpha/ia64/sparc stable (bug #399979). (diff)
downloadgentoo-2-0836bc7ac1160a4f34f91535878b55a96e028a84.tar.gz
gentoo-2-0836bc7ac1160a4f34f91535878b55a96e028a84.tar.bz2
gentoo-2-0836bc7ac1160a4f34f91535878b55a96e028a84.zip
Sync live ebuild.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog5
-rw-r--r--sys-boot/grub/grub-9999.ebuild28
2 files changed, 24 insertions, 9 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 11c52c829f82..6814d0846d3a 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.188 2012/03/17 07:58:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.189 2012/03/17 22:30:14 floppym Exp $
+
+ 17 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-9999.ebuild:
+ Sync live ebuild.
17 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta2.ebuild:
Enable building x86_64-efi target on an x86 host. Bug 408545.
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7c5e7c9b02f7..60a14c3df010 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.57 2012/03/08 10:23:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.58 2012/03/17 22:30:14 floppym Exp $
EAPI=4
@@ -122,15 +122,27 @@ grub_src_configure() {
[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
- # check if we have to specify the target (EFI)
- # or just append correct --with-platform
- if [[ ${platform} == efi-32 ]]; then
- # Build 32-bit EFI on 64-bit system
- target="--target=i386"
- fi
+ # Used below for efi cross-building
+ tc-export CC NM OBJCOPY STRIP
+ unset TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
case ${platform} in
- efi-*) with_platform="--with-platform=${platform%-*}" ;;
+ efi-32)
+ if [[ ${CHOST} == x86_64* ]]; then
+ target="--target=i386"
+ export TARGET_CC="${CC}"
+ fi
+ with_platform="--with-platform=efi"
+ ;;
+ efi-64)
+ if [[ ${CHOST} == i?86* ]]; then
+ target="--target=x86_64"
+ export TARGET_CC="${CC}"
+ export TARGET_CFLAGS="-march=x86-64"
+ export TARGET_CPPFLAGS="-march=x86-64"
+ fi
+ with_platform="--with-platform=efi"
+ ;;
guessed) ;;
*) with_platform="--with-platform=${platform}" ;;
esac