--- old/bin/phase-functions.sh 2023-01-16 05:11:19.000000000 +0700 +++ new/bin/phase-functions.sh 2023-03-26 23:26:17.000000000 +0700 @@ -165,6 +165,19 @@ # Otherwise, we don't need to filter the environment. [[ -f "${T}/environment.raw" ]] || return 0 + local make_config="" make_opts_local="" make_opts_env="" make_opts_envprefix="" + if [[ "${EMERGE_FROM}" = binary ]]; then + make_config="$(dirname "${PORTAGE_BASHRC}")/make.conf" + if [ -f "${make_config}" ]; then + make_opts_local="$(grep "^MAKEOPTS" "${make_config}")" + make_opts_env="$(grep "MAKEOPTS=" "${T}/environment")" + make_opts_envprefix="${make_opts_env%MAKEOPTS*}" + #echo "******* MAKEOPTS_local=${make_opts_envprefix}${make_opts_local} *******" + #echo "******* MAKEOPTS_env =${make_opts_env} *******" + sed -i "s/${make_opts_env}/${make_opts_envprefix}${make_opts_local}/" "${T}/environment" + fi + fi + __filter_readonly_variables ${_portage_filter_opts} < "${T}"/environment \ >> "${T}/environment.filtered" || return $?