diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-03-17 07:58:43 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-03-17 07:58:43 +0000 |
| commit | 7a51fb3e648bbcaf327df8e3eb158fc54eca5ae1 (patch) | |
| tree | d3dfb4bf6e6b0f8ccf5adbaad9306a063e1fd8fb /sys-boot | |
| parent | Mask USE="skype" for bitlbee on non-multilib systems. (diff) | |
| download | historical-7a51fb3e648bbcaf327df8e3eb158fc54eca5ae1.tar.gz historical-7a51fb3e648bbcaf327df8e3eb158fc54eca5ae1.tar.bz2 historical-7a51fb3e648bbcaf327df8e3eb158fc54eca5ae1.zip | |
Enable building x86_64-efi target on an x86 host. Bug 408545.
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 10 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.00_beta2.ebuild | 28 |
3 files changed, 29 insertions, 14 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 699b29d713ff..11c52c829f82 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.187 2012/03/11 17:48:52 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.188 2012/03/17 07:58:43 floppym Exp $ + + 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. *grub-2.00_beta2 (11 Mar 2012) diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index ab8e5dcfaee3..47229eddae02 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -47,14 +47,14 @@ EBUILD grub-0.97.ebuild 4238 RMD160 498e38af891b8e1a147356f4e1c97ca12c2a6429 SHA EBUILD grub-1.99-r2.ebuild 8285 RMD160 2b6ae9f59dda41f0893438c9c03e7ad9b0c2e7d9 SHA1 8aaae86ab3ae0092e3c343e7fd1fd58d0d19dac3 SHA256 783fad22b5cae394862725d5eaeed80ad7a26dcce833f65fed0b3135858ae171 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 5835 RMD160 5691c510d4bc373da0d467605a6a904499190336 SHA1 07dbff13ee59b389c2c905aa2cac928fbcd0443b SHA256 ea270cf232d23ae2244a29c6caffcab0ad10e513c607fbfbca5007479c947bba +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 38049 RMD160 de3b598fde98d1ba525758e7283fe351edd20bda SHA1 619b8f7d0ad893f45bdfebe8384dfcdf49b53e68 SHA256 9e98f5d5675f35309cad7b993cd41d28062dae8bf3341950d5f8bb7d3c9efb22 +MISC ChangeLog 38187 RMD160 fcc8cce0aeab3af746f875ecf2c017e847e8c5a5 SHA1 412ca4031ae5fc3677c752e5211899a81503f055 SHA256 5cd2fef20843daa72c679ae4afc47d7c668739386b63f2a64f9e731b70c89ef0 MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk9c5Y0ACgkQC77qH+pIQ6RePAD/X0+wRlE7l8AgvK6L0Pux3ncf -gXNrRTvmMlQr64M+m2kA/AsdWE2vuejhcPlb4sDPFZZAstBj0GzLG5J0bWdCWc6N -=VZ8y +iF4EAREIAAYFAk9kRD8ACgkQC77qH+pIQ6RcZAD6An43L8Qq099gRw6qwpjzaizQ +L4vU63aNmGbeFx4aKNABAMqmYUZlGlKi2F8qkaCzC+zk6ekAyUKGMcQKSm3CXZC4 +=oaVh -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-2.00_beta2.ebuild b/sys-boot/grub/grub-2.00_beta2.ebuild index a5f46fc6b51c..350490500b89 100644 --- a/sys-boot/grub/grub-2.00_beta2.ebuild +++ b/sys-boot/grub/grub-2.00_beta2.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-2.00_beta2.ebuild,v 1.1 2012/03/11 17:48:52 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta2.ebuild,v 1.2 2012/03/17 07:58:43 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 |