--- trunk/core/include/multilib.sminc	2008/10/10 13:29:42	2
+++ trunk/core/include/multilib.sminc	2009/12/27 23:35:37	4783
@@ -61,7 +61,10 @@
 	export CC="gcc -${ABI}"
 	export CXX="g++ -${ABI}"
 	export ABI_LIBDIR="lib"
-	export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
+	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
+	then
+		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
+	fi
 	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
 
 	echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
@@ -69,7 +72,12 @@
 	echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
 	echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
 	echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
+	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
+	then
+		echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
+	else
+		echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
+	fi
 	echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 
 	# configure a linux32 emulated build
@@ -100,7 +108,10 @@
 	export CC="gcc -${ABI}"
 	export CXX="g++ -${ABI}"
 	export ABI_LIBDIR="lib64"
-	export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
+	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
+	then
+		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
+	fi
 	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
 
 	echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
@@ -108,7 +119,12 @@
 	echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
 	echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
 	echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
+	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
+	then
+		echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
+	else
+		echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
+	fi
 	echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
 	echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 
@@ -174,9 +190,12 @@
 # multilib compile functions
 ##
 
-# rename the old one
-old_mconfigure=old$(typeset -f mconfigure)
-eval ${old_mconfigure}
+if [[ ! -z $(typeset -f mconfigure) ]]
+then
+	# rename the old one
+	old_mconfigure=old$(typeset -f mconfigure)
+	eval "${old_mconfigure}"
+fi
 mconfigure()
 {
 	local abi
@@ -192,9 +211,35 @@
 	done
 }
 
-# rename the old one
-old_munpack=old$(typeset -f munpack)
-eval "${old_munpack}"
+if [[ ! -z $(typeset -f cmake_configure) ]]
+then
+	# rename the old one
+	old_cmake_configure=old$(typeset -f cmake_configure)
+	eval "${old_cmake_configure}"
+fi
+cmake_configure()
+{
+	local abi
+	local abis_to_run="${MULTILIB_ABIS}"
+
+	# respect MULTILIB_ONLY_ABI variable
+	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
+
+	local saved_SRCDIR="${SRCDIR}"
+	for abi in ${abis_to_run}
+	do
+		SRCDIR="${saved_SRCDIR}-${abi}"
+		cd ${SRCDIR}
+		abi-${abi} oldcmake_configure $@ || die
+	done
+}
+
+if [[ ! -z $(typeset -f munpack) ]]
+then
+	# rename the old one
+	old_munpack=old$(typeset -f munpack)
+	eval "${old_munpack}"
+fi
 munpack()
 {
 	local abi
@@ -211,9 +256,12 @@
 	done
 }
 
-# rename the old one
-old_mmake=old$(typeset -f mmake)
-eval "${old_mmake}"
+if [[ ! -z $(typeset -f mmake) ]]
+then
+	# rename the old one
+	old_mmake=old$(typeset -f mmake)
+	eval "${old_mmake}"
+fi
 mmake()
 {
 	local abi
@@ -230,9 +278,12 @@
 	done
 }
 
-# rename the old one
-old_minstall=old$(typeset -f minstall)
-eval "${old_minstall}"
+if [[ ! -z $(typeset -f minstall) ]]
+then
+	# rename the old one
+	old_minstall=old$(typeset -f minstall)
+	eval "${old_minstall}"
+fi
 minstall()
 {
 	local abi
@@ -265,9 +316,12 @@
 	done
 }
 
-# rename the old one
-old_mpatch=old$(typeset -f mpatch)
-eval "${old_mpatch}"
+if [[ ! -z $(typeset -f mpatch) ]]
+then
+	# rename the old one
+	old_mpatch=old$(typeset -f mpatch)
+	eval "${old_mpatch}"
+fi
 mpatch()
 {
 	local abi
@@ -284,9 +338,12 @@
 	done
 }
 
-# rename the old one
-old_mlibtoolize=old$(typeset -f mlibtoolize)
-eval "${old_mlibtoolize}"
+if [[ ! -z $(typeset -f mlibtoolize) ]]
+then
+	# rename the old one
+	old_mlibtoolize=old$(typeset -f mlibtoolize)
+	eval "${old_mlibtoolize}"
+fi
 mlibtoolize()
 {
 	local abi