diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2019-02-26 13:01:35 -0800 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2019-03-05 08:40:39 -0800 |
| commit | b348ae742d5041ca290b7342cd02e0227815855f (patch) | |
| tree | 10717fd85ecff405fcc1aa854c47e23dd33ad780 /deps/openssl | |
| parent | c8d9ea4439e258a1983579100618bed70b2d524a (diff) | |
| download | android-node-v8-b348ae742d5041ca290b7342cd02e0227815855f.tar.gz android-node-v8-b348ae742d5041ca290b7342cd02e0227815855f.tar.bz2 android-node-v8-b348ae742d5041ca290b7342cd02e0227815855f.zip | |
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 <gpunathi@in.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl')
| -rw-r--r-- | deps/openssl/config/Makefile | 3 | ||||
| -rw-r--r-- | deps/openssl/config/README.md | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index 300ab009d8..5de96ab84d 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 45ca72b797..d24d54ad2c 100644 --- a/deps/openssl/config/README.md +++ b/deps/openssl/config/README.md @@ -96,7 +96,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 ``` |