Pass -Os in TARGET_CFLAGS for efi-64 on x86. Don't clobber TARGET variables in case the user wants to play with them. Set CTARGET to pass --target option to configure.

Package-Manager: portage-2.2.0_alpha91/cvs/Linux x86_64

4 files changed, 51 insertions, 27 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 6814d0846d3a..eb021250d098 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # 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.189 2012/03/17 22:30:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.190 2012/03/18 06:41:10 floppym Exp $
+
+  18 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta2.ebuild,
+  grub-9999.ebuild:
+  Pass -Os in TARGET_CFLAGS for efi-64 on x86. Don't clobber TARGET variables in
+  case the user wants to play with them. Set CTARGET to pass --target option to
+  configure.
 
   17 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-9999.ebuild:
   Sync live ebuild.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index e1f439f293d3..13e55519dbd3 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 6090 RMD160 383a0308f0bfcc3bb5ee62b2d33c065277cb1975 SHA1 c523eff381ee382d79be5356950847140f2e7dec SHA256 3645fb6de485a375db72172ed755bcb02c047917411d1cf33f034b52f9e54957
-EBUILD grub-9999.ebuild 6085 RMD160 6e79841572b6464d3cd5e50bbbceca44bfe7db02 SHA1 a1aaa96b68a252520dce4bb36351390e8ae9ecaa SHA256 dad62bf6442cb12d8fb2c6180b29f7f3ee581cff86f7b708a2ccd441c6669dcd
-MISC ChangeLog 38275 RMD160 5971aee074e4be64993f510e8fa44eeccfd34db5 SHA1 2f2e52179322d674f2dbce7392a256e093a2d666 SHA256 b4a9aff10f583a3ee58d9f864fada97f21e2d8047a71ade3c1180ab05cd4c8ab
+EBUILD grub-2.00_beta2.ebuild 6476 RMD160 43557ca6eb3e61f66fe4d8c2977d9ac1e4db2d96 SHA1 0d7d68e9869b646275d28e1acd3badbe80b33559 SHA256 d60330fd91721d586fe4254bbaa02add8accc2ea729fff1c376aa544ed4f96ca
+EBUILD grub-9999.ebuild 6471 RMD160 44a6134970c488856e0df8f637e99768bdb00181 SHA1 c3c8c14032951bcc8a2350f97674e2156476c972 SHA256 d7ea52eca2b187d6d256bade46e0ba30def79e7d416c3ced1c63a72f4b308a4b
+MISC ChangeLog 38543 RMD160 c742dc7225d95c749bf5b240ef47558b3f9c42c8 SHA1 2d2db8eb6ac68018a9c4cd083a1e136f8acc59e9 SHA256 82931f80ca3c43e1787000e6bcb3ff472ccf1d90ce9c521a700cb24e84e6ec02
 MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9lEHwACgkQC77qH+pIQ6QCuwEAlO4dT3ptyTLj83J9dQpbkeZJ
-i162vCcbMp4fGUwU+igBAKXhiAcBXREstEg0SGdAFvf1awZBgkWsRfLjvRWUXuTL
-=E76V
+iF4EAREIAAYFAk9lg40ACgkQC77qH+pIQ6Qh0wEAmChN5DZMhzDghTYjhXl0/RUy
+GaSlktemV5LjQ/7wcHEBAIcE86C2eZ9cahNjw1uAeP0o4Jg3nVnLISt1l3eA/ZFO
+=tEKX
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_beta2.ebuild b/sys-boot/grub/grub-2.00_beta2.ebuild
index 350490500b89..9818c2cb2685 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.2 2012/03/17 07:58:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta2.ebuild,v 1.3 2012/03/18 06:41:10 floppym Exp $
 
 EAPI=4
 
@@ -117,29 +117,34 @@ grub_run_phase() {
 
 grub_src_configure() {
 	local platform=$1
-	local target=
 	local with_platform=
 
 	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
 
 	# Used below for efi cross-building
 	tc-export CC NM OBJCOPY STRIP
-	unset TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
+
+	estack_push CTARGET "${CTARGET}"
+	estack_push TARGET_CC "${TARGET_CC}"
+	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
+	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
 
 	case ${platform} in
 		efi-32)
 			if [[ ${CHOST} == x86_64* ]]; then
-				target="--target=i386"
-				export TARGET_CC="${CC}"
+				CTARGET="${CTARGET:-i386}"
+				TARGET_CC="${TARGET_CC:-${CC}}"
+				export TARGET_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"
+				CTARGET="${CTARGET:-x86_64}"
+				TARGET_CC="${TARGET_CC:-${CC}}"
+				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
 			fi
 			with_platform="--with-platform=efi"
 			;;
@@ -153,7 +158,6 @@ grub_src_configure() {
 		--program-prefix= \
 		--program-transform-name="s,grub,grub2," \
 		--with-grubdir=grub2 \
-		${target} \
 		${with_platform} \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu-usb) \
@@ -164,6 +168,11 @@ grub_src_configure() {
 		$(use_enable truetype grub-mkfont) \
 		$(use_enable libzfs) \
 		$(use sdl && use_enable debug grub-emu-sdl)
+
+	estack_pop CTARGET CTARGET || die
+	estack_pop TARGET_CC TARGET_CC || die
+	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
+	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
 }
 
 grub_src_compile() {
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 60a14c3df010..441fca77806a 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.58 2012/03/17 22:30:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.59 2012/03/18 06:41:10 floppym Exp $
 
 EAPI=4
 
@@ -117,29 +117,34 @@ grub_run_phase() {
 
 grub_src_configure() {
 	local platform=$1
-	local target=
 	local with_platform=
 
 	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
 
 	# Used below for efi cross-building
 	tc-export CC NM OBJCOPY STRIP
-	unset TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
+
+	estack_push CTARGET "${CTARGET}"
+	estack_push TARGET_CC "${TARGET_CC}"
+	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
+	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
 
 	case ${platform} in
 		efi-32)
 			if [[ ${CHOST} == x86_64* ]]; then
-				target="--target=i386"
-				export TARGET_CC="${CC}"
+				CTARGET="${CTARGET:-i386}"
+				TARGET_CC="${TARGET_CC:-${CC}}"
+				export TARGET_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"
+				CTARGET="${CTARGET:-x86_64}"
+				TARGET_CC="${TARGET_CC:-${CC}}"
+				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
 			fi
 			with_platform="--with-platform=efi"
 			;;
@@ -153,7 +158,6 @@ grub_src_configure() {
 		--program-prefix= \
 		--program-transform-name="s,grub,grub2," \
 		--with-grubdir=grub2 \
-		${target} \
 		${with_platform} \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu-usb) \
@@ -164,6 +168,11 @@ grub_src_configure() {
 		$(use_enable truetype grub-mkfont) \
 		$(use_enable libzfs) \
 		$(use sdl && use_enable debug grub-emu-sdl)
+
+	estack_pop CTARGET CTARGET || die
+	estack_pop TARGET_CC TARGET_CC || die
+	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
+	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
 }
 
 grub_src_compile() {