From f395a4a401477afa38a66926b4d9c11341b12ff7 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Thu, 24 Jan 2019 13:57:50 -0800 Subject: [PATCH] deps: remove OpenSSL git and travis configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenSSL is packaging its git and travis configuration files. Remove them, Node.js has its own. PR-URL: https://github.com/nodejs/node/pull/25689 Reviewed-By: Daniel Bevenius Reviewed-By: Tobias Nießen Reviewed-By: Ujjwal Sharma --- deps/openssl/config/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index 300ab009d8fe8c..8923d17c85f213 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -27,7 +27,6 @@ COPTS = no-comp no-shared no-afalgeng # disable platform check in Configure NO_WARN_ENV = CONFIGURE_CHECKER_WARN=1 -GITIGNORE = $(OPSSL_SRC)/.gitignore GENERATE = ./generate_gypi.pl OPSSL_SRC = ../openssl @@ -45,8 +44,9 @@ all: $(ARCHS) replace # Configure and generate openssl asm files for each archs $(ARCHS): -# Remove openssl .gitignore to follow nodejs .gitignore - if [ -e $(GITIGNORE) ]; then rm $(GITIGNORE); fi +# Remove openssl git and travis configuration, nodejs has its own (and they +# should not have been packaged by upstream). + rm -rf $(OPSSL_SRC)/.git* $(OPSSL_SRC)/.travis* cd $(OPSSL_SRC); $(NO_WARN_ENV) CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@; $(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@ # Confgure asm_avx2 and generate upto avx2 support