[openssl] master update

Richard Levitte levitte at openssl.org
Wed Sep 23 09:10:10 UTC 2020


The branch master has been updated
       via  0ce47b35c7e6b6b82cfd86ec05b786338b8879c2 (commit)
      from  e771249c4f6bfb5b49d2c018447bcaa0039fd862 (commit)


- Log -----------------------------------------------------------------
commit 0ce47b35c7e6b6b82cfd86ec05b786338b8879c2
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Sep 21 20:56:34 2020 +0200

    Configurations/unix-Makefile.tmpl: make cleanup kinder
    
    The removal of certain types of files we structured like this:
    
        -$(RM) `find . {{options}} -print`
    
    This isn't very kind for shells with limited command line lengths
    (even when that limit is generous, in our case), so we rewrite those
    like this:
    
        -find . {{options}} -exec $(RM) {} \;
    
    Fixes #12938
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12939)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 7eb4ea76a6..44bf206d00 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -518,13 +518,13 @@ clean: libclean
 	$(RM) $(MANDOCS1) $(MANDOCS3) $(MANDOCS5) $(MANDOCS7)
 	$(RM) $(PROGRAMS) $(TESTPROGS) $(MODULES) $(SCRIPTS)
 	$(RM) $(GENERATED_MANDATORY) $(GENERATED)
-	-$(RM) `find . -name '*{- platform->depext() -}' \! -name '.*' \! -type d -print`
-	-$(RM) `find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -print`
+	-find . -name '*{- platform->depext() -}' \! -name '.*' \! -type d -exec $(RM) {} \;
+	-find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -exec $(RM) {} \;
 	$(RM) core
 	$(RM) tags TAGS doc-nits cmd-nits md-nits
 	$(RM) -r test/test-runs
 	$(RM) openssl.pc libcrypto.pc libssl.pc
-	-$(RM) `find . -type l \! -name '.*' -print`
+	-find . -type l \! -name '.*' -exec $(RM) {} \;
 	$(RM) $(TARFILE)
 
 distclean: clean


More information about the openssl-commits mailing list