From: Michał Górny <mgo...@gentoo.org>
---
bin/misc-functions.sh | 3 ++-
bin/phase-helpers.sh | 2 ++
bin/save-ebuild-env.sh | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index a7af3ec73..30e911fd6 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -224,7 +224,8 @@ install_qa_check() {
ecompressdir --dequeue
ecompress --dequeue
- "${PORTAGE_BIN_PATH}"/estrip --queue /
+ "${PORTAGE_BIN_PATH}"/estrip --queue "${PORTAGE_DOSTRIP[@]}"
+ "${PORTAGE_BIN_PATH}"/estrip --ignore "${PORTAGE_DOSTRIP_SKIP[@]}"
"${PORTAGE_BIN_PATH}"/estrip --dequeue
# Create NEEDED.ELF.2 regardless of RESTRICT=binchecks, since this info
is
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 5eeecfef7..f1f8d3992 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -20,6 +20,8 @@ export MOPREFIX=${PN}
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=( / )
+declare -a PORTAGE_DOSTRIP_SKIP=()
into() {
if [ "$1" == "/" ]; then
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index e5ae8af88..f624f44ec 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
--
2.13.6
