From cbb783693119f3b8a013982ae25be520a9d47b5b Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Tue, 26 Feb 2019 11:28:45 -0800 Subject: [PATCH] Revert "deps: remove OpenSSL git and travis configuration" This reverts commit f395a4a401477afa38a66926b4d9c11341b12ff7. As of openssl-1.1.1b, the dot-files are no longer distributed, so this is no longer necessary. PR-URL: https://github.com/nodejs/node/pull/26327 Reviewed-By: Gireesh Punathil Reviewed-By: Michael Dawson Reviewed-By: Ben Noordhuis --- 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 8923d17c85f..300ab009d8f 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -27,6 +27,7 @@ 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 @@ -44,9 +45,8 @@ all: $(ARCHS) replace # Configure and generate openssl asm files for each archs $(ARCHS): -# 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* +# Remove openssl .gitignore to follow nodejs .gitignore + if [ -e $(GITIGNORE) ]; then rm $(GITIGNORE); fi 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