| 1 |
From: Michał Górny <mgorny@g.o> |
| 2 |
|
| 3 |
Update RESTRICT=strip to control the default strip inclusion list |
| 4 |
as specified in EAPI 7 rather than disabling stripping entirely. |
| 5 |
This makes it possible to strip individual files. |
| 6 |
--- |
| 7 |
bin/estrip | 4 ++-- |
| 8 |
bin/phase-helpers.sh | 1 + |
| 9 |
2 files changed, 3 insertions(+), 2 deletions(-) |
| 10 |
|
| 11 |
diff --git a/bin/estrip b/bin/estrip |
| 12 |
index 24c6a461c..009dccfa0 100755 |
| 13 |
--- a/bin/estrip |
| 14 |
+++ b/bin/estrip |
| 15 |
@@ -16,7 +16,7 @@ exp_tf() { |
| 16 |
done |
| 17 |
} |
| 18 |
exp_tf FEATURES compressdebug installsources nostrip splitdebug xattr |
| 19 |
-exp_tf RESTRICT binchecks installsources splitdebug strip |
| 20 |
+exp_tf RESTRICT binchecks installsources splitdebug |
| 21 |
|
| 22 |
if ! ___eapi_has_prefix_variables; then |
| 23 |
EPREFIX= ED=${D} |
| 24 |
@@ -24,7 +24,7 @@ fi |
| 25 |
|
| 26 |
banner=false |
| 27 |
SKIP_STRIP=false |
| 28 |
-if ${RESTRICT_strip} || ${FEATURES_nostrip} ; then |
| 29 |
+if ${FEATURES_nostrip} ; then |
| 30 |
SKIP_STRIP=true |
| 31 |
banner=true |
| 32 |
${FEATURES_installsources} || exit 0 |
| 33 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
| 34 |
index f1f8d3992..020a49592 100644 |
| 35 |
--- a/bin/phase-helpers.sh |
| 36 |
+++ b/bin/phase-helpers.sh |
| 37 |
@@ -21,6 +21,7 @@ export PORTAGE_DOCOMPRESS_SIZE_LIMIT="128" |
| 38 |
declare -a PORTAGE_DOCOMPRESS=( /usr/share/{doc,info,man} ) |
| 39 |
declare -a PORTAGE_DOCOMPRESS_SKIP=( /usr/share/doc/${PF}/html ) |
| 40 |
declare -a PORTAGE_DOSTRIP=( / ) |
| 41 |
+has strip ${RESTRICT} && PORTAGE_DOSTRIP=() |
| 42 |
declare -a PORTAGE_DOSTRIP_SKIP=() |
| 43 |
|
| 44 |
into() { |
| 45 |
-- |
| 46 |
2.13.6 |
Archives