aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2018-03-26 12:12:51 -0700
committerZac Medico <zmedico@gentoo.org>2018-03-27 22:09:15 -0700
commit9aaa652c86b21b925bc56fafd57b561b86ace0f8 (patch)
tree1d148f9e8555521a9efeadd19a18c4f600203f4d /bin/save-ebuild-env.sh
parentprepstrip: rename to bin/estrip (refactor for EAPI 7 dostrip) (diff)
downloadportage-9aaa652c86b21b925bc56fafd57b561b86ace0f8.tar.gz
portage-9aaa652c86b21b925bc56fafd57b561b86ace0f8.tar.bz2
portage-9aaa652c86b21b925bc56fafd57b561b86ace0f8.zip
Add dostrip for EAPI 7
This patch includes the essential parts of the dostrip implementation from portage-mgorny. All of the prepstrip code has moved to bin/estrip, without any changes except the addition of argument parsing for estrip --ignore, --queue, and --deque modes which are equivalent to the corresponding ecompressdir modes. Due to overlap, also ban the non-standard prepstrip and prepallstrip helpers in EAPI 7, with a die message suggesting to use 'dostrip' instead. Also ignore the non-standard STRIP_MASK variable for EAPI 7. Bug: https://bugs.gentoo.org/203891
Diffstat (limited to 'bin/save-ebuild-env.sh')
-rw-r--r--bin/save-ebuild-env.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index e5ae8af88..947ac79d5 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -15,7 +15,7 @@ __save_ebuild_env() {
if has --exclude-init-phases $* ; then
unset S _E_DESTTREE _E_INSDESTTREE _E_DOCDESTTREE_ _E_EXEDESTTREE_ \
PORTAGE_DOCOMPRESS_SIZE_LIMIT PORTAGE_DOCOMPRESS \
- PORTAGE_DOCOMPRESS_SKIP
+ PORTAGE_DOCOMPRESS_SKIP PORTAGE_DOSTRIP PORTAGE_DOSTRIP_SKIP
if [[ -n $PYTHONPATH &&
${PYTHONPATH%%:*} -ef $PORTAGE_PYM_PATH ]] ; then
if [[ $PYTHONPATH == *:* ]] ; then
@@ -60,7 +60,7 @@ __save_ebuild_env() {
unpack __strip_duplicate_slashes econf einstall \
__dyn_setup __dyn_unpack __dyn_clean \
into insinto exeinto docinto \
- insopts diropts exeopts libopts docompress \
+ insopts diropts exeopts libopts docompress dostrip \
__abort_handler __abort_prepare __abort_configure __abort_compile \
__abort_test __abort_install __dyn_prepare __dyn_configure \
__dyn_compile __dyn_test __dyn_install \