Attachment #562498 for bug #676016

View | Details | Raw Unified | Return to bug 676016
Collapse All | Expand All

Lines 152-157 ___eapi_has_package_manager_build_group() { Link Here

(-)a/bin/eapi.sh (+8 lines)
152	[[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]	152	[[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
153	}	153	}
154		154
		155	___eapi_has_get_incdir() {
		156	[[ ${1-${EAPI-0}} =~ ^(7-multiarch)$ ]]
		157	}
		158
155	# HELPERS BEHAVIOR	159	# HELPERS BEHAVIOR
156		160
157	___eapi_best_version_and_has_version_support_--host-root() {	161	___eapi_best_version_and_has_version_support_--host-root() {
Lines 186-191 ___eapi_econf_passes_--with-sysroot() { Link Here
186	[[ ! ${1-${EAPI-0}} =~ ^(0\|1\|2\|3\|4\|4-python\|4-slot-abi\|5\|5-progress\|6)$ ]]	190	[[ ! ${1-${EAPI-0}} =~ ^(0\|1\|2\|3\|4\|4-python\|4-slot-abi\|5\|5-progress\|6)$ ]]
187	}	191	}
188		192
		193	___eapi_econf_passes_--includedir() {
		194	[[ ${1-${EAPI-0}} =~ ^(7-multiarch)$ ]]
		195	}
		196
189	___eapi_use_enable_and_use_with_support_empty_third_argument() {	197	___eapi_use_enable_and_use_with_support_empty_third_argument() {
190	[[ ! ${1-${EAPI-0}} =~ ^(0\|1\|2\|3)$ ]]	198	[[ ! ${1-${EAPI-0}} =~ ^(0\|1\|2\|3)$ ]]
191	}	199	}




		fi

		local conf_args=()
		if ___eapi_econf_passes_--disable-dependency-tracking || ___eapi_econf_passes_--disable-silent-rules || ___eapi_econf_passes_--docdir_and_--htmldir || ___eapi_econf_passes_--with-sysroot || ___eapi_econf_passes_--includedir; then
			local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null)

			if ___eapi_econf_passes_--disable-dependency-tracking; then

					conf_args+=( --with-sysroot="${ESYSROOT:-/}" )
				fi
			fi

			if ___eapi_econf_passes_--includedir; then
				# if the ebuild passes in --includedir, they're responsible for the conf_incdir fun.
				local CONF_INCDIR INCDIR_VAR="INCDIR_${ABI}"
				if [[ -n ${ABI} && -n ${!INCDIR_VAR} ]] ; then
					CONF_INCDIR=${!INCDIR_VAR}
				fi
				if [[ -n ${CONF_INCDIR} ]] && ! __hasgq --includedir=\* "$@" ; then
					export CONF_PREFIX=$(__hasg --exec-prefix=\* "$@")
					[[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(__hasg --prefix=\* "$@")
					: ${CONF_PREFIX:=${EPREFIX}/usr}
					CONF_PREFIX=${CONF_PREFIX#*=}
					[[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}"
					[[ ${CONF_INCDIR} != /* ]] && CONF_INCDIR="/${CONF_INCDIR}"
					conf_args+=(
						--includedir="$(__strip_duplicate_slashes "${CONF_PREFIX}${CONF_INCDIR}")"
					)
				fi
			fi
		fi

		# if the profile defines a location to install libs to aside from default, pass it on.

	___best_version_and_has_version_common "$@"
}

if ___eapi_has_get_incdir; then
	get_incdir() {
		local incdir_var="INCDIR_${ABI}"
		local incdir="include"

		[[ -n ${ABI} && -n ${!incdir_var} ]] && incdir=${!incdir_var}

		echo "${incdir}"
	}
fi

if ___eapi_has_get_libdir; then
	get_libdir() {
		local libdir_var="LIBDIR_${ABI}"
- 

Return to bug 676016

Lines 640-646 econf() { Link Here

(-)a/bin/phase-helpers.sh (-2 / +31 lines)
640	fi	640	fi
641		641
642	local conf_args=()	642	local conf_args=()
643	if ___eapi_econf_passes_--disable-dependency-tracking \|\| ___eapi_econf_passes_--disable-silent-rules \|\| ___eapi_econf_passes_--docdir_and_--htmldir \|\| ___eapi_econf_passes_--with-sysroot; then	643	if ___eapi_econf_passes_--disable-dependency-tracking \|\| ___eapi_econf_passes_--disable-silent-rules \|\| ___eapi_econf_passes_--docdir_and_--htmldir \|\| ___eapi_econf_passes_--with-sysroot \|\| ___eapi_econf_passes_--includedir; then
644	local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null)	644	local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null)
645		645
646	if ___eapi_econf_passes_--disable-dependency-tracking; then	646	if ___eapi_econf_passes_--disable-dependency-tracking; then
Lines 670-675 econf() { Link Here
670	conf_args+=( --with-sysroot="${ESYSROOT:-/}" )	670	conf_args+=( --with-sysroot="${ESYSROOT:-/}" )
671	fi	671	fi
672	fi	672	fi
		673
		674	if ___eapi_econf_passes_--includedir; then
		675	# if the ebuild passes in --includedir, they're responsible for the conf_incdir fun.
		676	local CONF_INCDIR INCDIR_VAR="INCDIR_${ABI}"
		677	if [[ -n ${ABI} && -n ${!INCDIR_VAR} ]] ; then
		678	CONF_INCDIR=${!INCDIR_VAR}
		679	fi
		680	if [[ -n ${CONF_INCDIR} ]] && ! __hasgq --includedir=\* "$@" ; then
		681	export CONF_PREFIX=$(__hasg --exec-prefix=\* "$@")
		682	[[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(__hasg --prefix=\* "$@")
		683	: ${CONF_PREFIX:=${EPREFIX}/usr}
		684	CONF_PREFIX=${CONF_PREFIX#*=}
		685	[[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}"
		686	[[ ${CONF_INCDIR} != /* ]] && CONF_INCDIR="/${CONF_INCDIR}"
		687	conf_args+=(
		688	--includedir="$(__strip_duplicate_slashes "${CONF_PREFIX}${CONF_INCDIR}")"
		689	)
		690	fi
		691	fi
673	fi	692	fi
674		693
675	# if the profile defines a location to install libs to aside from default, pass it on.	694	# if the profile defines a location to install libs to aside from default, pass it on.
Lines 976-981 best_version() { Link Here
976	___best_version_and_has_version_common "$@"	995	___best_version_and_has_version_common "$@"
977	}	996	}
978		997
		998	if ___eapi_has_get_incdir; then
		999	get_incdir() {
		1000	local incdir_var="INCDIR_${ABI}"
		1001	local incdir="include"
		1002
		1003	[[ -n ${ABI} && -n ${!incdir_var} ]] && incdir=${!incdir_var}
		1004
		1005	echo "${incdir}"
		1006	}
		1007	fi
		1008
979	if ___eapi_has_get_libdir; then	1009	if ___eapi_has_get_libdir; then
980	get_libdir() {	1010	get_libdir() {
981	local libdir_var="LIBDIR_${ABI}"	1011	local libdir_var="LIBDIR_${ABI}"
982	-