From 316fed88586c92633573a9f7f72d4f6474beccc2 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Tue, 26 Feb 2019 13:01:35 -0800 Subject: [PATCH] deps: openssl-1.1.1b no longer packages .gitignore Since its not packaged, we don't have to delete it, and the Makefile and update can become a (tiny) bit simpler. 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 | 3 --- deps/openssl/config/README.md | 1 - 2 files changed, 4 deletions(-) diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index 300ab009d8fe8c..5de96ab84d1dbc 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,6 @@ 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 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 diff --git a/deps/openssl/config/README.md b/deps/openssl/config/README.md index 16f702c30e96d6..1ad23be276d18c 100644 --- a/deps/openssl/config/README.md +++ b/deps/openssl/config/README.md @@ -118,7 +118,6 @@ $ git add deps/openssl/config/archs $ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h $ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h $ git add deps/openssl/openssl/include/openssl/opensslconf.h -$ git add deps/openssl/openssl/.gitignore $ git commit ```