summaryrefslogtreecommitdiff
path: root/deps/openssl
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2019-01-24 13:57:50 -0800
committerSam Roberts <vieuxtech@gmail.com>2019-02-04 10:25:05 -0800
commitf395a4a401477afa38a66926b4d9c11341b12ff7 (patch)
tree6d1177aebe3682d049eae7350bb997bcb7349053 /deps/openssl
parent5506dcdd73a69b353c12c7137d6cba49a4c07123 (diff)
downloadandroid-node-v8-f395a4a401477afa38a66926b4d9c11341b12ff7.tar.gz
android-node-v8-f395a4a401477afa38a66926b4d9c11341b12ff7.tar.bz2
android-node-v8-f395a4a401477afa38a66926b4d9c11341b12ff7.zip
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>
Diffstat (limited to 'deps/openssl')
-rw-r--r--deps/openssl/config/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile
index 300ab009d8..8923d17c85 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,9 @@ 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
+# Remove openssl git and travis configuration, nodejs has its own (and they
+# 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) $@;
$(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@
# Confgure asm_avx2 and generate upto avx2 support