Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 736794
Collapse All | Expand All

(-)old/bin/phase-functions.sh (+13 lines)
Lines 165-170 Link Here
165
	# Otherwise, we don't need to filter the environment.
165
	# Otherwise, we don't need to filter the environment.
166
	[[ -f "${T}/environment.raw" ]] || return 0
166
	[[ -f "${T}/environment.raw" ]] || return 0
167
167
168
	local make_config="" make_opts_local="" make_opts_env="" make_opts_envprefix=""
169
	if [[ "${EMERGE_FROM}" = binary ]]; then
170
		make_config="$(dirname "${PORTAGE_BASHRC}")/make.conf"
171
		if [ -f "${make_config}" ]; then
172
			make_opts_local="$(grep "^MAKEOPTS" "${make_config}")"
173
			make_opts_env="$(grep "MAKEOPTS=" "${T}/environment")"
174
			make_opts_envprefix="${make_opts_env%MAKEOPTS*}"
175
			#echo "******* MAKEOPTS_local=${make_opts_envprefix}${make_opts_local} *******"
176
			#echo "******* MAKEOPTS_env  =${make_opts_env} *******"
177
			sed -i "s/${make_opts_env}/${make_opts_envprefix}${make_opts_local}/" "${T}/environment"
178
		fi
179
	fi
180
168
	__filter_readonly_variables ${_portage_filter_opts} < "${T}"/environment \
181
	__filter_readonly_variables ${_portage_filter_opts} < "${T}"/environment \
169
		>> "${T}/environment.filtered" || return $?
182
		>> "${T}/environment.filtered" || return $?
170
183

Return to bug 736794