Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 75420 | Differences between
and this patch

Collapse All | Expand All

(-)dolib (+6 lines)
Lines 5-6 Link Here
5
5
6
LIBDIR_VAR="LIBDIR_${ABI}"
7
if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
8
	CONF_LIBDIR="${!LIBDIR_VAR}"
9
fi        
10
unset LIBDIR_VAR
11
6
if [ -z "${CONF_LIBDIR}" ]; then
12
if [ -z "${CONF_LIBDIR}" ]; then
(-)ebuild-functions.sh (-2 / +12 lines)
Lines 90-92 econf() { Link Here
90
		# if the ebuild passes in --libdir, they're responsible for the conf_libdir fun.
90
		# if the ebuild passes in --libdir, they're responsible for the conf_libdir fun.
91
		if [ ! -z "${CONF_LIBDIR}" ] && [ "${*/--libdir}" == "$*" ]; then
91
		LIBDIR_VAR="LIBDIR_${ABI}"
92
		if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
93
			CONF_LIBDIR="${!LIBDIR_VAR}"
94
		fi
95
		unset LIBDIR_VAR
96
		if [ -n "${CONF_LIBDIR}" ] && [ "${*/--libdir}" == "$*" ]; then
92
			if [ "${*/--prefix}" == "$*" ]; then
97
			if [ "${*/--prefix}" == "$*" ]; then
Lines 140-142 einstall() Link Here
140
	# CONF_PREFIX is only set if they didn't pass in libdir above
145
	# CONF_PREFIX is only set if they didn't pass in libdir above
141
	if [ ! -z "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
146
	LIBDIR_VAR="LIBDIR_${ABI}"
147
	if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
148
		CONF_LIBDIR="${!LIBDIR_VAR}"
149
	fi
150
	unset LIBDIR_VAR
151
	if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
142
		EXTRA_EINSTALL="libdir=${D}/${CONF_PREFIX}/${CONF_LIBDIR} ${EXTRA_EINSTALL}"
152
		EXTRA_EINSTALL="libdir=${D}/${CONF_PREFIX}/${CONF_LIBDIR} ${EXTRA_EINSTALL}"
(-)preplib (+6 lines)
Lines 5-6 Link Here
5
5
6
LIBDIR_VAR="LIBDIR_${ABI}"
7
if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
8
	CONF_LIBDIR="${!LIBDIR_VAR}"
9
fi
10
unset LIBDIR_VAR
11
6
if [ -z "${CONF_LIBDIR}" ]; then
12
if [ -z "${CONF_LIBDIR}" ]; then

Return to bug 75420