--- smage/trunk/include/multilib.sminc	2013/12/16 10:20:07	5217
+++ smage/trunk/include/multilib.sminc	2014/03/25 10:52:50	5461
@@ -229,27 +229,27 @@
 
 mabi-cc()
 {
-	echo "\"gcc -\${ABI}\""
+	echo "gcc -\${ABI}"
 }
 
 mabi-cxx()
 {
-	echo "\"g++ -\${ABI}\""
+	echo "g++ -\${ABI}"
 }
 
 mabi-cflags()
 {
-	echo "\"\${CFLAGS}\""
+	echo "\${CFLAGS}"
 }
 
 mabi-cxxflags()
 {
-	echo "\"\${CXXFLAGS}\""
+	echo "\${CXXFLAGS}"
 }
 
 mabi-ldflags()
 {
-	echo "\"\${LDFLAGS}\""
+	echo "\${LDFLAGS}"
 }
 
 ##
@@ -261,7 +261,7 @@
 	# rename the old one
 	old_mconfigure=old$(typeset -f mconfigure)
 	eval "${old_mconfigure}"
-fi
+
 mconfigure()
 {
 	local abi
@@ -276,13 +276,14 @@
 		abi-${abi} oldmconfigure $@ || die
 	done
 }
+fi
 
 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
@@ -294,20 +295,100 @@
 	local saved_SRCDIR="${SRCDIR}"
 	for abi in ${abis_to_run}
 	do
+		cd ${BUILDDIR}/build-${abi}
 		SRCDIR="${saved_SRCDIR}-${abi}"
-		cd ${SRCDIR}/${SRCSUBDIR}
 		abi-${abi} oldcmake_configure $@ || die
 	done
 	# restore SRCDIR
 	SRCDIR="${saved_SRCDIR}"
 }
+fi
+
+if [[ ! -z $(typeset -f cmake_src_compile) ]]
+then
+	# rename the old one
+	old_cmake_src_compile=old$(typeset -f cmake_src_compile)
+	eval "${old_cmake_src_compile}"
+
+cmake_src_compile()
+{
+	local abi
+	local abis_to_run="${MULTILIB_ABIS}"
+
+	# respect MULTILIB_ONLY_ABI variable
+	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
+
+	for abi in ${abis_to_run}
+	do
+		# remove build dir if exist
+		[[ -d ${BUILDDIR}/build-${abi} ]] && rm -rf ${BUILDDIR}/build-${abi}
+
+		# build outside of the source dir
+		install -d ${BUILDDIR}/build-${abi} || die
+		cd ${BUILDDIR}/build-${abi}
+	done
+
+	cmake_configure || die
+
+	for abi in ${abis_to_run}
+	do
+		cd ${BUILDDIR}/build-${abi}
+		abi-${abi} oldmmake $@ || die
+	done
+}
+fi
+
+if [[ ! -z $(typeset -f cmake_src_check) ]]
+then
+	# rename the old one
+	old_cmake_src_check=old$(typeset -f cmake_src_check)
+	eval "${old_cmake_check}"
+
+cmake_src_check()
+{
+	local abi
+	local abis_to_run="${MULTILIB_ABIS}"
+
+	# respect MULTILIB_ONLY_ABI variable
+	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
+
+	for abi in ${abis_to_run}
+	do
+		cd ${BUILDDIR}/build-${abi}
+		mmake -j1 -k check || die
+	done
+}
+fi
+
+if [[ ! -z $(typeset -f cmake_src_install) ]]
+then
+	# rename the old one
+	old_cmake_src_install=old$(typeset -f cmake_src_install)
+	eval "${old_cmake_install}"
+
+cmake_src_install()
+{
+	local abi
+	local abis_to_run="${MULTILIB_ABIS}"
+
+	# respect MULTILIB_ONLY_ABI variable
+	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
+
+	for abi in ${abis_to_run}
+	do
+		# install build outside of the source dir
+		cd ${BUILDDIR}/build-${abi}
+		abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
+	done
+}
+fi
 
 if [[ ! -z $(typeset -f munpack) ]]
 then
 	# rename the old one
 	old_munpack=old$(typeset -f munpack)
 	eval "${old_munpack}"
-fi
+
 munpack()
 {
 	local abi
@@ -323,13 +404,14 @@
 		mv ${SRCDIR} ${SRCDIR}-${abi} || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f mmake) ]]
 then
 	# rename the old one
 	old_mmake=old$(typeset -f mmake)
 	eval "${old_mmake}"
-fi
+
 mmake()
 {
 	local abi
@@ -345,13 +427,14 @@
 		abi-${abi} oldmmake $@ || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f minstall) ]]
 then
 	# rename the old one
 	old_minstall=old$(typeset -f minstall)
 	eval "${old_minstall}"
-fi
+
 minstall()
 {
 	local abi
@@ -367,6 +450,7 @@
 		abi-${abi} oldminstall $@ || die
 	done
 }
+fi
 
 minstall_destdir()
 {
@@ -389,7 +473,7 @@
 	# rename the old one
 	old_mpatch=old$(typeset -f mpatch)
 	eval "${old_mpatch}"
-fi
+
 mpatch()
 {
 	local abi
@@ -405,13 +489,14 @@
 		oldmpatch $@ || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f mlibtoolize) ]]
 then
 	# rename the old one
 	old_mlibtoolize=old$(typeset -f mlibtoolize)
 	eval "${old_mlibtoolize}"
-fi
+
 mlibtoolize()
 {
 	local abi
@@ -427,13 +512,14 @@
 		oldmlibtoolize $@ || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f mautoreconf) ]]
 then
 	# rename the old one
 	old_mautoreconf=old$(typeset -f mautoreconf)
 	eval "${old_mautoreconf}"
-fi
+
 mautoreconf()
 {
 	local abi
@@ -449,13 +535,14 @@
 		oldmautoreconf $@ || die
 	done
 }
+fi
 
 if [[ ! -z $(typeset -f minstalldocs) ]]
 then
 	# rename the old one
 	old_minstalldocs=old$(typeset -f minstalldocs)
 	eval "${old_minstalldocs}"
-fi
+
 minstalldocs()
 {
 	local abi
@@ -472,6 +559,7 @@
 		oldminstalldocs $@ || die
 	done
 }
+fi
 
 ##
 # multilib mbuild wrappers
@@ -483,18 +571,33 @@
 
 multilib_src_compile()
 {
-	mconfigure || die
-	mmake || die
+	if [[ ! -z $(typeset -f cmake_src_compile) ]]
+	then
+		cmake_src_compile || die
+	else
+		mconfigure || die
+		mmake || die
+	fi
 }
 
 multilib_src_check()
 {
-	mmake -j1 -k check || die
+	if [[ ! -z $(typeset -f cmake_src_check) ]]
+	then
+		cmake_src_check || die
+	else
+		mmake -j1 -k check || die
+	fi
 }
 
 multilib_src_install()
 {
-	mmake DESTDIR=${BINDIR} install || die
+	if [[ ! -z $(typeset -f cmake_src_install) ]]
+	then
+		cmake_src_install || die
+	else
+		mmake DESTDIR=${BINDIR} install || die
+	fi
 
 	local i
 	for abi in ${MULTILIB_ABIS}