--- trunk/include/multilib.sminc	2012/03/12 15:02:20	11522
+++ trunk/include/multilib.sminc	2014/03/03 09:56:03	20987
@@ -1,6 +1,9 @@
 # $Id$
 # multilib abis
 
+# tell the buildsystem that we are doing a multilib build
+export MULTILIB_BUILD="true"
+
 # be verbose or nor (true|false}
 : ${MULTILIB_VERBOSE="true"}
 
@@ -89,6 +92,8 @@
 		else
 			echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
 		fi
+		echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
 		echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 	fi
 
@@ -100,7 +105,7 @@
 			echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
 		fi
 		uname(){ linux32 uname $@; } && export -f uname
-		ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"
+		local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
 	fi
 	if [[ ${MULTILIB_VERBOSE} = true ]]
 	then
@@ -119,7 +124,7 @@
 	if [[ ${EMUL_LINUX_32} = true ]]
 	then
 		unset uname
-		export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST
+		export CHOST="${orig_chost}" && unset orig_chost
 	fi
 }
 
@@ -152,6 +157,7 @@
 			echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
 		fi
 		echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
 		echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 	fi
 
@@ -221,6 +227,31 @@
 	echo \${ABI}
 }
 
+mabi-cc()
+{
+	echo "gcc -\${ABI}"
+}
+
+mabi-cxx()
+{
+	echo "g++ -\${ABI}"
+}
+
+mabi-cflags()
+{
+	echo "\${CFLAGS}"
+}
+
+mabi-cxxflags()
+{
+	echo "\${CXXFLAGS}"
+}
+
+mabi-ldflags()
+{
+	echo "\${LDFLAGS}"
+}
+
 ##
 # multilib compile functions
 ##
@@ -230,7 +261,7 @@
 	# rename the old one
 	old_mconfigure=old$(typeset -f mconfigure)
 	eval "${old_mconfigure}"
-fi
+
 mconfigure()
 {
 	local abi
@@ -245,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
@@ -263,20 +295,100 @@
 	local saved_SRCDIR="${SRCDIR}"
 	for abi in ${abis_to_run}
 	do
+		cd ${BUILDDIR}/build-${abi}
 		SRCDIR="${saved_SRCDIR}-${abi}"
-		cd ${SRCDIR}-${abi}/${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
@@ -288,17 +400,18 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
-		oldmunpack ${SRCFILE} || die
+		oldmunpack $@ || die
 		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
@@ -314,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
@@ -336,6 +450,7 @@
 		abi-${abi} oldminstall $@ || die
 	done
 }
+fi
 
 minstall_destdir()
 {
@@ -358,7 +473,7 @@
 	# rename the old one
 	old_mpatch=old$(typeset -f mpatch)
 	eval "${old_mpatch}"
-fi
+
 mpatch()
 {
 	local abi
@@ -374,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
@@ -396,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
@@ -418,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
@@ -441,29 +559,45 @@
 		oldminstalldocs $@ || die
 	done
 }
+fi
 
 ##
 # multilib mbuild wrappers
 ##
 multilib_src_prepare()
 {
-	munpack
+	munpack ${SRCFILE} || die
 }
 
 multilib_src_compile()
 {
-	mconfigure
-	mmake
+	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()
 {
-	minstall_destdir
+	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}