Revert "deps: remove OpenSSL git and travis configuration"

sam-github · BridgeAR · commit dd95d072afc4 · 2019-03-12T20:57:44.000+01:00
This reverts commit f395a4a. As of openssl-1.1.1b, the dot-files are no longer distributed, so this is no longer necessary. PR-URL: #26327 Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
diff --git 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
