pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/install Deal with strip idiosyncracies:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee52631e98bc
branches:  trunk
changeset: 565191:ee52631e98bc
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Sep 18 10:11:48 2009 +0000

description:
Deal with strip idiosyncracies:
- sometimes creates the temporary file, but fails
- sometimes it is successful, but still keeps the temporary file
- sometimes it crashes when called with more than one argument
Bite the bullet and call it individually with explicit output file
and clean up after it.

diffstat:

 mk/install/install.mk |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 6728a579e84d -r ee52631e98bc mk/install/install.mk
--- a/mk/install/install.mk     Fri Sep 18 09:59:54 2009 +0000
+++ b/mk/install/install.mk     Fri Sep 18 10:11:48 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.54 2009/09/02 22:05:42 joerg Exp $
+# $NetBSD: install.mk,v 1.55 2009/09/18 10:11:48 joerg Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -343,7 +343,15 @@
        @${STEP_MSG} "Automatic stripping of debug information"
        ${RUN}${CAT} ${_PLIST_NOKEYWORDS} \
        | ${SED} -e 's|^|${DESTDIR}${PREFIX}/|' \
-       | ${XARGS} ${STRIP} -g 2>/dev/null || ${TRUE}
+       | while read f; do \
+               tmp_f="$${fname}.XXX"
+               if ${STRIP} -g -o "$${tmp_f}" "$${f}" 2> /dev/null; then \
+                       [ ! -f "$${f}.tmpXXX" ] || \
+                           ${MV} "$${tmp_f}" "$${f}"; \
+               else \
+                       ${RM} -f $${tmp_f}; \
+               fi \
+       done
 
 ######################################################################
 ### install-doc-handling (PRIVATE)



Home | Main Index | Thread Index | Old Index