Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] nostrip_files: allow full path
@ 2022-01-06  0:55 tornaria
  2022-01-08  1:26 ` [PR PATCH] [Updated] " tornaria
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: tornaria @ 2022-01-06  0:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 952 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages nostrip_files
https://github.com/void-linux/void-packages/pull/34886

nostrip_files: allow full path
The option `nostrip_files` takes a filename without path, in contrast to
option `nopie_files` which takes only full path.

This is inconvenient in a case where there are two binaries with the
same name and only one must be stripped.

Case in point: maxima contains executables

    /usr/lib/maxima/5.45.1/binary-ecl/maxima
    /usr/lib/maxima/5.45.1/binary-sbcl/maxima

The second one breaks if stripped, but the first one is ok.

See: https://github.com/void-linux/void-packages/issues/34861#issuecomment-1006197772

This commit makes it so that `nostrip_files` can take either the
filename or the full path.



A patch file from https://github.com/void-linux/void-packages/pull/34886.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nostrip_files-34886.patch --]
[-- Type: text/x-diff, Size: 1035 bytes --]

From 093a1fa78ac0c78ecf4d189d4fecabcdcb516fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 5 Jan 2022 20:59:20 -0300
Subject: [PATCH] nostrip_files: allow full path

The option `nostrip_files` takes a filename without path, in contrast to
option `nopie_files` which takes only full path.

This commit makes it so that `nostrip_files` can take either the
filename or the full path.
---
 common/hooks/post-install/06-strip-and-debug-pkgs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2cec68412c50..191c025e552c 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -72,7 +72,7 @@ hook() {
 
 		fname=${f##*/}
 		for x in ${nostrip_files}; do
-			if [ "$x" = "$fname" ]; then
+			if [ "$x" = "$fname" -o "$x" = "${f#$PKGDESTDIR}" ]; then
 				found=1
 				break
 			fi

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-01-08 16:51 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-06  0:55 [PR PATCH] nostrip_files: allow full path tornaria
2022-01-08  1:26 ` [PR PATCH] [Updated] " tornaria
2022-01-08  1:28 ` tornaria
2022-01-08  1:29 ` [PR PATCH] [Updated] " tornaria
2022-01-08 16:51 ` [PR PATCH] [Merged]: " Chocimier

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).