[openssl] OpenSSL_1_1_1-stable update
Matt Caswell
matt at openssl.org
Thu Oct 31 10:37:31 UTC 2019
The branch OpenSSL_1_1_1-stable has been updated
via ac613b900694243edb2808f6df5f6072f2f0a5b9 (commit)
from 43a8f91f00e35b20e33c393f5b79215c277c508e (commit)
- Log -----------------------------------------------------------------
commit ac613b900694243edb2808f6df5f6072f2f0a5b9
Author: Tanzinul Islam <t_17_7 at hotmail.com>
Date: Fri Oct 25 17:47:25 2019 +0100
Fix find/rm command in Unix clean recipe
The `./pyca-cryptography/.travis/downstream.d` subdirectory that causes the `rm` command to fail (albeit harmlessly, but with a warning from `make` nonetheless).
>rm -f `find . -name '*.d' \! -name '.*' -print`
>rm: cannot remove './pyca-cryptography/.travis/downstream.d': Is a directory
>make: [Makefile:1910: clean] Error 1 (ignored)
Exclude directories from being matched by the `find` commands.
CLA: trivial
Reviewed-by: Patrick Steuer <patrick.steuer at de.ibm.com>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10264)
(cherry picked from commit 38b71bd4704ee1746e862f5a7a4e170fd84a5eb0)
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 7db7578a4b..9bf54f2127 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -516,8 +516,8 @@ libclean:
clean: libclean
$(RM) $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
$(RM) $(GENERATED_MANDATORY) $(GENERATED)
- -$(RM) `find . -name '*{- $depext -}' \! -name '.*' -print`
- -$(RM) `find . -name '*{- $objext -}' \! -name '.*' -print`
+ -$(RM) `find . -name '*{- $depext -}' \! -name '.*' \! -type d -print`
+ -$(RM) `find . -name '*{- $objext -}' \! -name '.*' \! -type d -print`
$(RM) core
$(RM) tags TAGS doc-nits
$(RM) -r test/test-runs
More information about the openssl-commits
mailing list