diff options
| -rwxr-xr-x | bin/ebuild.sh | 6 | ||||
| -rw-r--r-- | bin/isolated-functions.sh | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 1764da1ff..59bf46e91 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1152,9 +1152,6 @@ dyn_install() { #our custom version of libtool uses $S and $D to fix #invalid paths in .la files export S D - #some packages uses an alternative to $S to build in, cause - #our libtool to create problematic .la files - export PWORKDIR="$WORKDIR" # Reset exeinto(), docinto(), insinto(), and into() state variables # in case the user is running the install phase multiple times @@ -2244,9 +2241,6 @@ ebuild_main() { #our custom version of libtool uses $S and $D to fix #invalid paths in .la files export S D - #some packages use an alternative to $S to build in, cause - #our libtool to create problematic .la files - export PWORKDIR=$WORKDIR ;; esac diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index f89c11ed5..b5bb73adc 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -602,7 +602,7 @@ save_ebuild_env() { PORTAGE_BASHRCS_SOURCED PORTAGE_NONFATAL PORTAGE_QUIET \ PORTAGE_SANDBOX_DENY PORTAGE_SANDBOX_PREDICT \ PORTAGE_SANDBOX_READ PORTAGE_SANDBOX_WRITE PREROOTPATH \ - PWORKDIR QA_INTERCEPTORS \ + QA_INTERCEPTORS \ RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL RC_INDENTATION \ ROOT ROOTPATH RPMDIR TEMP TMP TMPDIR USE_EXPAND \ WARN XARGS _RC_GET_KV_CACHE |