daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: remove OpenSSL git and travis configuration 

OpenSSL is packaging its git and travis configuration files. Remove
them, Node.js has its own.

PR-URL: https://github.com/nodejs/node/pull/25689
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
pull/25920/head
Sam Roberts 2019-01-24 13:57:50 -08:00
parent 5506dcdd73
commit f395a4a401
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/openssl/config/Makefile vendored
View File

@ -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
@ -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