diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-03-17 22:30:14 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-03-17 22:30:14 +0000 |
| commit | c919baf1bcb9157f830555c8f003edb4b36b2502 (patch) | |
| tree | 1c97f3fee90bb0bde329dca630f4b2083dd482df /sys-boot/grub | |
| parent | alpha/ia64/sparc stable (bug #399979). (diff) | |
| download | historical-c919baf1bcb9157f830555c8f003edb4b36b2502.tar.gz historical-c919baf1bcb9157f830555c8f003edb4b36b2502.tar.bz2 historical-c919baf1bcb9157f830555c8f003edb4b36b2502.zip | |
Sync live ebuild.
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 10 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 28 |
3 files changed, 29 insertions, 14 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/Manifest b/sys-boot/grub/Manifest index 47229eddae02..e1f439f293d3 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -48,13 +48,13 @@ EBUILD grub-1.99-r2.ebuild 8285 RMD160 2b6ae9f59dda41f0893438c9c03e7ad9b0c2e7d9 EBUILD grub-2.00_beta0.ebuild 5993 RMD160 88832dcfd48236a47039c12c89c0099f2033b1de SHA1 9453ac5ec45265ddf5be0003e4e858757f00f6de SHA256 ff8d30de025e10e061f47097d502501e628c146ea2ce8d91b2b1bbf04ffb52ef EBUILD grub-2.00_beta1.ebuild 5837 RMD160 7269e69d2c57d79f3299dded2b9ac26c9c625e10 SHA1 d3b629db5ae54b3f8e9e168bcca51949e54a6136 SHA256 9b159e68d77c414e5b8e131ab3b18fe009e116ec78a7721a267f1ddd0bf91db9 EBUILD grub-2.00_beta2.ebuild 6090 RMD160 383a0308f0bfcc3bb5ee62b2d33c065277cb1975 SHA1 c523eff381ee382d79be5356950847140f2e7dec SHA256 3645fb6de485a375db72172ed755bcb02c047917411d1cf33f034b52f9e54957 -EBUILD grub-9999.ebuild 5832 RMD160 9a95f3eca4b3b0a927d8b7a6150ece225c682bd1 SHA1 804b6f52af6c534455e046c48c902172aaa42b2f SHA256 be520c329cbf6da3e0c601e465af07cd0c2b799dc9441253b5f1b6cf24ec03a5 -MISC ChangeLog 38187 RMD160 fcc8cce0aeab3af746f875ecf2c017e847e8c5a5 SHA1 412ca4031ae5fc3677c752e5211899a81503f055 SHA256 5cd2fef20843daa72c679ae4afc47d7c668739386b63f2a64f9e731b70c89ef0 +EBUILD grub-9999.ebuild 6085 RMD160 6e79841572b6464d3cd5e50bbbceca44bfe7db02 SHA1 a1aaa96b68a252520dce4bb36351390e8ae9ecaa SHA256 dad62bf6442cb12d8fb2c6180b29f7f3ee581cff86f7b708a2ccd441c6669dcd +MISC ChangeLog 38275 RMD160 5971aee074e4be64993f510e8fa44eeccfd34db5 SHA1 2f2e52179322d674f2dbce7392a256e093a2d666 SHA256 b4a9aff10f583a3ee58d9f864fada97f21e2d8047a71ade3c1180ab05cd4c8ab MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk9kRD8ACgkQC77qH+pIQ6RcZAD6An43L8Qq099gRw6qwpjzaizQ -L4vU63aNmGbeFx4aKNABAMqmYUZlGlKi2F8qkaCzC+zk6ekAyUKGMcQKSm3CXZC4 -=oaVh +iF4EAREIAAYFAk9lEHwACgkQC77qH+pIQ6QCuwEAlO4dT3ptyTLj83J9dQpbkeZJ +i162vCcbMp4fGUwU+igBAKXhiAcBXREstEg0SGdAFvf1awZBgkWsRfLjvRWUXuTL +=E76V -----END PGP SIGNATURE----- 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 |