Skip to content

Commit

Permalink
deps: openssl-1.1.1b no longer packages .gitignore
Browse files Browse the repository at this point in the history
Since its not packaged, we don't have to delete it, and the Makefile
and update can become a (tiny) bit simpler.

Backport-PR-URL: #27419
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>
  • Loading branch information
sam-github authored and MylesBorins committed May 16, 2019
1 parent ebe0b05 commit f270eee
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
3 changes: 0 additions & 3 deletions deps/openssl/config/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion deps/openssl/config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down

0 comments on commit f270eee

Please sign in to comment.