From: Michał Górny <mgo...@gentoo.org>
Update RESTRICT=strip to control the default strip inclusion list
as specified in EAPI 7 rather than disabling stripping entirely.
This makes it possible to strip individual files.
---
bin/estrip | 4 ++--
bin/phase-helpers.sh | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/bin/estrip b/bin/estrip
index 24c6a461c..009dccfa0 100755
--- a/bin/estrip
+++ b/bin/estrip
@@ -16,7 +16,7 @@ exp_tf() {
done
}
exp_tf FEATURES compressdebug installsources nostrip splitdebug xattr
-exp_tf RESTRICT binchecks installsources splitdebug strip
+exp_tf RESTRICT binchecks installsources splitdebug
if ! ___eapi_has_prefix_variables; then
EPREFIX= ED=${D}
@@ -24,7 +24,7 @@ fi
banner=false
SKIP_STRIP=false
-if ${RESTRICT_strip} || ${FEATURES_nostrip} ; then
+if ${FEATURES_nostrip} ; then
SKIP_STRIP=true
banner=true
${FEATURES_installsources} || exit 0
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index f1f8d3992..020a49592 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -21,6 +21,7 @@ export PORTAGE_DOCOMPRESS_SIZE_LIMIT="128"
declare -a PORTAGE_DOCOMPRESS=( /usr/share/{doc,info,man} )
declare -a PORTAGE_DOCOMPRESS_SKIP=( /usr/share/doc/${PF}/html )
declare -a PORTAGE_DOSTRIP=( / )
+has strip ${RESTRICT} && PORTAGE_DOSTRIP=()
declare -a PORTAGE_DOSTRIP_SKIP=()
into() {
--
2.13.6
