richardphibel / rpms / rpm

Forked from rpms/rpm 2 years ago
Clone
672c60
From 09d181d78c16e1751779586c606e85c11f360407 Mon Sep 17 00:00:00 2001
672c60
From: Florian Festi <ffesti@redhat.com>
672c60
Date: Tue, 25 Jun 2019 18:04:20 +0200
672c60
Subject: [PATCH] Use newline as a delimiter to avoid xargs messing up file
672c60
 names with quotes
672c60
672c60
which is the default behaviour otherwise.
672c60
672c60
Fixes rhbz#1721348
672c60
---
672c60
 scripts/brp-strip-static-archive | 2 +-
672c60
 1 file changed, 1 insertion(+), 1 deletion(-)
672c60
672c60
diff --git a/scripts/brp-strip-static-archive b/scripts/brp-strip-static-archive
672c60
index 13d9a098b..f7fb26b87 100755
672c60
--- a/scripts/brp-strip-static-archive
672c60
+++ b/scripts/brp-strip-static-archive
672c60
@@ -15,4 +15,4 @@ esac
672c60
 # Strip static libraries.
672c60
 find "$RPM_BUILD_ROOT" -type f | \
672c60
     grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
672c60
-    xargs -r -P$NCPUS -n32 sh -c "file \"\$@\" | sed 's/:  */: /' | grep 'current ar archive' | sed -n -e 's/^\(.*\):[  ]*current ar archive/\1/p' | xargs -I\{\} $STRIP -g \{\}" ARG0
672c60
+    xargs -d '\n' -r -P$NCPUS -n32 sh -c "file \"\$@\" | sed 's/:  */: /' | grep 'current ar archive' | sed -n -e 's/^\(.*\):[  ]*current ar archive/\1/p' | xargs -d '\n' -I\{\} $STRIP -g \{\}" ARG0
672c60
-- 
672c60
2.21.0
672c60