Skip to content

Commit

Permalink
deps: remove OpenSSL git and travis configuration
Browse files Browse the repository at this point in the history
OpenSSL is packaging its git and travis configuration files. Remove
them, Node.js has its own.

PR-URL: #25689
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
  • Loading branch information
sam-github authored and addaleax committed Feb 6, 2019
1 parent e28d891 commit 8b71464
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions deps/openssl/config/Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ COPTS = no-comp no-shared no-afalgeng
# disable platform check in Configure # disable platform check in Configure
NO_WARN_ENV = CONFIGURE_CHECKER_WARN=1 NO_WARN_ENV = CONFIGURE_CHECKER_WARN=1


GITIGNORE = $(OPSSL_SRC)/.gitignore
GENERATE = ./generate_gypi.pl GENERATE = ./generate_gypi.pl


OPSSL_SRC = ../openssl OPSSL_SRC = ../openssl
Expand All @@ -45,8 +44,9 @@ all: $(ARCHS) replace


# Configure and generate openssl asm files for each archs # Configure and generate openssl asm files for each archs
$(ARCHS): $(ARCHS):
# Remove openssl .gitignore to follow nodejs .gitignore # Remove openssl git and travis configuration, nodejs has its own (and they
if [ -e $(GITIGNORE) ]; then rm $(GITIGNORE); fi # should not have been packaged by upstream).
rm -rf $(OPSSL_SRC)/.git* $(OPSSL_SRC)/.travis*
cd $(OPSSL_SRC); $(NO_WARN_ENV) CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@; cd $(OPSSL_SRC); $(NO_WARN_ENV) CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@;
$(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@ $(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@
# Confgure asm_avx2 and generate upto avx2 support # Confgure asm_avx2 and generate upto avx2 support
Expand Down

0 comments on commit 8b71464

Please sign in to comment.