Attachment #82310 for bug #118815

Lines 2356-2362 Link Here

(-)pym/portage.py (-1 / +1 lines)
2356	phase_retval = spawn(actionmap[mydo]["cmd"] % mydo, mysettings, debug=debug, logfile=logfile, **kwargs)	2356	phase_retval = spawn(actionmap[mydo]["cmd"] % mydo, mysettings, debug=debug, logfile=logfile, **kwargs)
2357	if phase_retval == os.EX_OK:	2357	if phase_retval == os.EX_OK:
2358	if mydo == "install":	2358	if mydo == "install":
2359	mycommand = " ".join([MISC_SH_BINARY, "install_qa_check"])	2359	mycommand = " ".join([MISC_SH_BINARY, "install_qa_check", "install_multilib_wrappers"])
2360	return spawn(mycommand, mysettings, debug=debug, logfile=logfile, **kwargs)	2360	return spawn(mycommand, mysettings, debug=debug, logfile=logfile, **kwargs)
2361	return phase_retval	2361	return phase_retval
2362		2362




shift $#
source /usr/lib/portage/bin/ebuild.sh

install_multilib_wrappers() {
	# Only needed on multilib profiles
	[[ "${MULTILIB_ABIS/ }" != "${MULTILIB_ABIS}" ]] || return
	
	MULTILIB_WRAPPER_MASK="${MULTILIB_WRAPPER_MASK:-*-config}"
	save_IFS
	IFS=":"
	for mypath in ${PATH} ; do
		restore_IFS
		if [[ -d ${D}/${mypath} ]] ; then
			dowrap=$(find ${D}${mypath} -type f -name "${MULTILIB_WRAPPER_MASK}" | sed -e "s:${D}/::" | \
			gawk '
			BEGIN { split("'"${MULTILIB_WRAPPER_IGNORE}"'", ignore); }
			{       for (idx in ignore)
					if ($NF ~ "^"ignore[idx]"$")
					next;
				print;
			}')
			for file in ${dowrap} ; do
				mv -f ${file} ${file}-${ABI}
				ln -s /usr/lib/portage/bin/abi-wrapper-config ${file}
			done
		fi
	done
}

install_qa_check() {

	prepall




#!/bin/bash
# ${PN}-config is a link to this abi-wrapper on multilib-systems to
# assure options like --libs return the correct ABI-specific values.
# This must match the multilib-behaviour of the set profile!

if [[ -n ${ABI} ]] ; then
	abi=${ABI}
elif [[ -n ${DEFAULT_ABI} ]] ; then
	abi=${DEFAULT_ABI}
else 
	# we're called from outside portage, so try default first
	abis=$(portageq envvar DEFAULT_ABI MULTILIB_ABIS)
	for abi in ${abis} ; do
		[[ -f ${0}-${abi} ]] && break
		unset abi
	done
fi

if [[ -f ${0}-${abi} ]] ; then
	exec ${0}-${abi} ${@}
else
	echo "${0}: abi-wrapper-config couldn't find script for current abi" >&2
	exit 1
fi
  + *

Return to bug 118815

Lines 16-21 Link Here

(-)bin/misc-functions.sh (+26 lines)
16	shift $#	16	shift $#
17	source /usr/lib/portage/bin/ebuild.sh	17	source /usr/lib/portage/bin/ebuild.sh
18		18
		19	install_multilib_wrappers() {
		20	# Only needed on multilib profiles
		21	[[ "${MULTILIB_ABIS/ }" != "${MULTILIB_ABIS}" ]] \|\| return
		22
		23	MULTILIB_WRAPPER_MASK="${MULTILIB_WRAPPER_MASK:-*-config}"
		24	save_IFS
		25	IFS=":"
		26	for mypath in ${PATH} ; do
		27	restore_IFS
		28	if [[ -d ${D}/${mypath} ]] ; then
		29	dowrap=$(find ${D}${mypath} -type f -name "${MULTILIB_WRAPPER_MASK}" \| sed -e "s:${D}/::" \| \
		30	gawk '
		31	BEGIN { split("'"${MULTILIB_WRAPPER_IGNORE}"'", ignore); }
		32	{ for (idx in ignore)
		33	if ($NF ~ "^"ignore[idx]"$")
		34	next;
		35	print;
		36	}')
		37	for file in ${dowrap} ; do
		38	mv -f ${file} ${file}-${ABI}
		39	ln -s /usr/lib/portage/bin/abi-wrapper-config ${file}
		40	done
		41	fi
		42	done
		43	}
		44
19	install_qa_check() {	45	install_qa_check() {
20		46
21	prepall	47	prepall

Line 0 Link Here

(-)bin/abi-wrapper-config (+24 lines)
		1	#!/bin/bash
		2	# ${PN}-config is a link to this abi-wrapper on multilib-systems to
		3	# assure options like --libs return the correct ABI-specific values.
		4	# This must match the multilib-behaviour of the set profile!
		5
		6	if [[ -n ${ABI} ]] ; then
		7	abi=${ABI}
		8	elif [[ -n ${DEFAULT_ABI} ]] ; then
		9	abi=${DEFAULT_ABI}
		10	else
		11	# we're called from outside portage, so try default first
		12	abis=$(portageq envvar DEFAULT_ABI MULTILIB_ABIS)
		13	for abi in ${abis} ; do
		14	[[ -f ${0}-${abi} ]] && break
		15	unset abi
		16	done
		17	fi
		18
		19	if [[ -f ${0}-${abi} ]] ; then
		20	exec ${0}-${abi} ${@}
		21	else
		22	echo "${0}: abi-wrapper-config couldn't find script for current abi" >&2
		23	exit 1
		24	fi
0	+ *	25	+ *