From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] hooks/post-install/06-strip-and-debug-pkgs.sh: speed up.
Date: Fri, 29 Jan 2021 19:47:59 +0100 [thread overview]
Message-ID: <20210129184759.TMjz7t2chxOfN0q0Z7vm38aLyrYM1Sk3kTEFrjR9BvM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28278@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages faster-strip-and-debug
https://github.com/void-linux/void-packages/pull/28278
hooks/post-install/06-strip-and-debug-pkgs.sh: speed up.
Only run file once for each file in the destdir, only double-check
when we are about to strip the ELF files.
A patch file from https://github.com/void-linux/void-packages/pull/28278.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-faster-strip-and-debug-28278.patch --]
[-- Type: text/x-diff, Size: 1653 bytes --]
From cf8ff51e27a206f8487608f72bf8303f38e16615 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 01:18:07 +0100
Subject: [PATCH] hooks/post-install/06-strip-and-debug-pkgs.sh: speed up.
Only run file once for each file in the destdir, only double-check
when we are about to strip the ELF files.
---
.../hooks/post-install/06-strip-and-debug-pkgs.sh | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index b59dde5ab3c..52591c38b31 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -70,10 +70,6 @@ hook() {
continue
fi
- if [[ $(file -b "$f") =~ "no machine" ]]; then
- continue
- fi
-
fname=${f##*/}
for x in ${nostrip_files}; do
if [ "$x" = "$fname" ]; then
@@ -119,6 +115,13 @@ hook() {
fi
;;
application/x-sharedlib*|application/x-pie-executable*)
+ local type="$(file -b "$f")"
+ if [[ $type =~ "no machine" ]]; then
+ # using ELF as a container format (e.g. guile)
+ echo " Ignoring ELF file without machine set: ${f#$PKGDESTDIR}"
+ continue
+ fi
+
chmod +w "$f"
# shared library
make_debug "$f"
@@ -127,7 +130,7 @@ hook() {
msg_red "$pkgver: failed to strip ${f#$PKGDESTDIR}\n"
return 1
fi
- if [[ $(file $f) =~ "interpreter " ]]; then
+ if [[ $type =~ "interpreter " ]]; then
echo " Stripped position-independent executable: ${f#$PKGDESTDIR}"
else
echo " Stripped library: ${f#$PKGDESTDIR}"
next prev parent reply other threads:[~2021-01-29 18:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 0:19 [PR PATCH] " leahneukirchen
2021-01-29 18:47 ` leahneukirchen [this message]
2021-01-30 14:20 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210129184759.TMjz7t2chxOfN0q0Z7vm38aLyrYM1Sk3kTEFrjR9BvM@z \
--to=leahneukirchen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).