[patch] Alternative patch: using 'unset' state

multilib-eclass-v2.patch (text/plain), 966 bytes, created by Michał Górny on 2013-03-14 07:58:24 UTC

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.102
diff -u -B -r1.102 multilib.eclass
--- multilib.eclass	21 Jan 2013 19:22:25 -0000	1.102
+++ multilib.eclass	14 Mar 2013 07:58:11 -0000
@@ -397,7 +397,8 @@
 	if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then
 		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do
 			vv="__abi_saved_${v}"
-			export ${v}="${!vv}"
+			unset ${v}
+			[[ ${!vv+1} ]] && export ${v}="${!vv}"
 			unset ${vv}
 		done
 		unset __DEFAULT_ABI_SAVED
@@ -408,7 +409,9 @@
 	if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
 		# Back that multilib-ass up so we can restore it later
 		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do
-			export __abi_saved_${v}="${!v}"
+			vv=__abi_saved_${v}
+			unset ${vv}
+			[[ ${!v+1} ]] && export ${vv}="${!v}"
 		done
 		export __DEFAULT_ABI_SAVED="true"