[gentoo-commits] proj/crossdev:master commit in: /, wrappers/

[Mike Frysinger]

commit:     ffccaa9cd610d9c7a3c778a4b560dfbd3ebca386
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 03:10:24 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 03:10:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=ffccaa9c

wrappers: drop UCLIBC_CPU support

We've deleted most of this from the uclibc ebuilds and have been pushing
people to use CFLAGS for optimization selection.  Drop the logic from
here too.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 crossdev                | 5 +----
 wrappers/emerge-wrapper | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/crossdev b/crossdev
index a4ff901..b0f5ab7 100755
--- a/crossdev
+++ b/crossdev
@@ -636,7 +636,7 @@ if [[ ${HCHOST} == "${CTARGET}" ]] ; then
 fi
 
 # grab user settings
-for v in MULTILIB_ABIS UCLIBC_CPU USE BVER GVER KVER LVER STAGE CFLAGS LDFLAGS ASFLAGS ; do
+for v in MULTILIB_ABIS USE BVER GVER KVER LVER STAGE CFLAGS LDFLAGS ASFLAGS ; do
 	d="${CONFIGROOT}/crossdev/${CTARGET}"
 	if [[ -e ${d}/${v} ]] ; then
 		# yes, quotes are needed in this instance (export $var="...")
@@ -1102,9 +1102,6 @@ export FEATURES="${FEATURES} -stricter"
 # maybe someday this work, but that day != today
 USE="${USE} -selinux"
 
-# only allow UCLIBC_CPU from env, not from make.conf/profile
-export UCLIBC_CPU=${UCLIBC_CPU}
-
 if ! ex_fast ; then
 
 	# stage 0: binutils

diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index 4658b5f..545e8c2 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -60,12 +60,6 @@ cross_wrap_etc()
 		-e "s:__CBUILD__:${CBUILD}:g" \
 		"${conf}"
 
-	# Merge UCLIBC_CPU from env only
-	local v
-	for v in ${import_vars} UCLIBC_CPU ; do
-		[[ -n ${!v} ]] && echo "${v}=\"${!v}\""
-	done >> "${conf}"
-
 	return 0
 }