--- trunk/core/include/multilib.sminc	2009/12/27 23:21:20	4782
+++ trunk/include/multilib.sminc	2012/04/18 21:41:58	11827
@@ -1,6 +1,15 @@
-# $Header: /magellan-cvs/smage/include/multilib.sminc,v 1.33 2007-11-13 15:49:09 niro Exp $
+# $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"}
+
+# multilib should call all dependant includes, which gets overridden
+sminclude mtools
+
 # do not define EMUL_LINUX_32 after inherit of multlib !!
 # it may break i*86 builds
 
@@ -14,8 +23,8 @@
 		# add linux32 to the dependencies
 		if [[ ${EMUL_LINUX_32} = true ]]
 		then
-			EMUL_LINUX_32_SDEPENDS_x86_64=">= dev-util/linux32-1"
-			SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPENDS_x86_64"
+			EMUL_LINUX_32_SDEPEND_x86_64=">= sys-apps/util-linux-2.19"
+			SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPEND_x86_64"
 		fi
 		;;
 	i*86)
@@ -33,10 +42,10 @@
 	# the var ist decided with our common eval+echo magic
 	if [[ -z ${SDEPEND} ]]
 	then
-		SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"
+		SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
 	else
 		SDEPEND="${SDEPEND}
-			\$(eval echo \\\$EMUL_LINUX_32_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"
+			\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
 	fi
 fi
 
@@ -63,36 +72,53 @@
 	export ABI_LIBDIR="lib"
 	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
 	then
-		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
+		local saved_ldflags="${LDFLAGS}"
+		export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
 	fi
-	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
+	# keep pkgconfig clean
+	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
+	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
 
-	echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
-	echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
-	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
+	if [[ ${MULTILIB_VERBOSE} = true ]]
 	then
-		echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
-	else
-		echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
+		echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
+		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}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 	fi
-	echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 
 	# configure a linux32 emulated build
 	if [[ ${EMUL_LINUX_32} = true ]]
 	then
-		echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
+		if [[ ${MULTILIB_VERBOSE} = true ]]
+		then
+			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"
 	fi
-	echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
+	if [[ ${MULTILIB_VERBOSE} = true ]]
+	then
+		echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
+	fi
 
 	# run any given command
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH
+	unset ABI CC CXX ABI_LIBDIR
+	# keep pkgconfig clean
+	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
+	export LDFLAGS="${saved_ldflags}"
 
 	# restore original settings
 	if [[ ${EMUL_LINUX_32} = true ]]
@@ -110,28 +136,38 @@
 	export ABI_LIBDIR="lib64"
 	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
 	then
+		local saved_ldflags="${LDFLAGS}"
 		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
 	fi
-	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
+	# keep pkgconfig clean
+	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
+	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
 
-	echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
-	echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
-	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
+	if [[ ${MULTILIB_VERBOSE} = true ]]
 	then
-		echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
-	else
-		echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
+		echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
+		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}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
+		echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 	fi
-	echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
-	echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
 
 	# run any given command
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH
+	unset ABI CC CXX ABI_LIBDIR
+	# keep pkgconfig clean
+	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
+	export LDFLAGS="${saved_ldflags}"
 }
 
 only-m32()
@@ -146,7 +182,7 @@
 			# export this for mpatch etc (to repect only-${abi})
 			export MULTILIB_ONLY_ABI=${abi}
 
-			cd ${SRCDIR}-${abi}
+			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 			abi-${abi} $@ || die
 
 			# unset this is very important
@@ -167,7 +203,7 @@
 			# export this for mpatch etc (to repect only-${abi})
 			export MULTILIB_ONLY_ABI=${abi}
 
-			cd ${SRCDIR}-${abi}
+			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 			abi-${abi} $@ || die
 
 			# unset this is very important
@@ -181,11 +217,26 @@
 	local abi
 	for abi in ${MULTILIB_ABIS}
 	do
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} $@ || die
 	done
 }
 
+mabi()
+{
+	echo \${ABI}
+}
+
+mabi-cc()
+{
+	echo "\"gcc -\${ABI}\""
+}
+
+mabi-cxx()
+{
+	echo "\"g++ -\${ABI}\""
+}
+
 ##
 # multilib compile functions
 ##
@@ -194,7 +245,7 @@
 then
 	# rename the old one
 	old_mconfigure=old$(typeset -f mconfigure)
-	eval ${old_mconfigure}
+	eval "${old_mconfigure}"
 fi
 mconfigure()
 {
@@ -206,7 +257,7 @@
 
 	for abi in ${abis_to_run}
 	do
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} oldmconfigure $@ || die
 	done
 }
@@ -215,7 +266,7 @@
 then
 	# rename the old one
 	old_cmake_configure=old$(typeset -f cmake_configure)
-	eval ${old_cmake_configure}
+	eval "${old_cmake_configure}"
 fi
 cmake_configure()
 {
@@ -229,9 +280,11 @@
 	for abi in ${abis_to_run}
 	do
 		SRCDIR="${saved_SRCDIR}-${abi}"
-		cd ${SRCDIR}
+		cd ${SRCDIR}/${SRCSUBDIR}
 		abi-${abi} oldcmake_configure $@ || die
 	done
+	# restore SRCDIR
+	SRCDIR="${saved_SRCDIR}"
 }
 
 if [[ ! -z $(typeset -f munpack) ]]
@@ -273,7 +326,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} oldmmake $@ || die
 	done
 }
@@ -295,7 +348,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		abi-${abi} oldminstall $@ || die
 	done
 }
@@ -311,7 +364,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		make DESTDIR=${BINDIR} $@ install || die
 	done
 }
@@ -333,7 +386,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		oldmpatch $@ || die
 	done
 }
@@ -355,16 +408,43 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		oldmlibtoolize $@ || die
 	done
 }
 
+if [[ ! -z $(typeset -f mautoreconf) ]]
+then
+	# rename the old one
+	old_mautoreconf=old$(typeset -f mautoreconf)
+	eval "${old_mautoreconf}"
+fi
+mautoreconf()
+{
+	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
+		echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+		oldmautoreconf $@ || die
+	done
+}
+
+if [[ ! -z $(typeset -f minstalldocs) ]]
+then
+	# rename the old one
+	old_minstalldocs=old$(typeset -f minstalldocs)
+	eval "${old_minstalldocs}"
+fi
 minstalldocs()
 {
 	local abi
 	local docfiles
-	docfiles="$@"
 
 	local abis_to_run="${MULTILIB_ABIS}"
 
@@ -373,18 +453,8 @@
 
 	for abi in ${abis_to_run}
 	do
-		cd ${SRCDIR}-${abi}
-		if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ]
-		then
-			install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."
-		fi
-
-		for i in ${docfiles}
-		do
-			cat ${SRCDIR}-${abi}/${i} | gzip -9c > ${SRCDIR}-${abi}/${i}.gz || die "gzipping docs."
-			install -m 0644 ${SRCDIR}-${abi}/${i}.gz \
-				${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
-		done
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+		oldminstalldocs $@ || die
 	done
 }
 
@@ -402,6 +472,11 @@
 	mmake
 }
 
+multilib_src_check()
+{
+	mmake -j1 -k check || die
+}
+
 multilib_src_install()
 {
 	minstall_destdir
@@ -409,7 +484,7 @@
 	local i
 	for abi in ${MULTILIB_ABIS}
 	do
-		cd ${SRCDIR}-${abi}
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
 		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
 			FAQ LICENSE NEWS README TODO
 		do
@@ -421,4 +496,4 @@
 	done
 }
 
-export_inherits multilib src_prepare src_compile src_install
+export_inherits multilib src_prepare src_compile src_check src_install