Revert "deps: remove OpenSSL git and travis configuration" · nodejs/node@dd95d07 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 636
• Pull requests 762
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit dd95d07

Browse filesBrowse the repository at this point in the historyBrowse files

sam-github

authored and

BridgeAR

committed

Revert "deps: remove OpenSSL git and travis configuration"

This reverts commit f395a4a. As of openssl-1.1.1b, the dot-files are no longer distributed, so this is no longer necessary. 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>

1 parent 0abb724 commit dd95d07
Copy full SHA for dd95d07

1 file changed

+3-3Lines changed: 3 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• deps/openssl/config
  • Makefile

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎deps/openssl/config/Makefile‎

Copy file name to clipboardExpand all lines: deps/openssl/config/Makefile

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -27,6 +27,7 @@ COPTS = no-comp no-shared no-afalgeng
27	27	# disable platform check in Configure
28	28	NO_WARN_ENV = CONFIGURE_CHECKER_WARN=1
29	29
	30	+ GITIGNORE = $(OPSSL_SRC)/.gitignore
30	31	GENERATE = ./generate_gypi.pl
31	32
32	33	OPSSL_SRC = ../openssl
@@ -44,9 +45,8 @@ all: $(ARCHS) replace
44	45
45	46	# Configure and generate openssl asm files for each archs
46	47	$(ARCHS):
47		- # Remove openssl git and travis configuration, nodejs has its own (and they
48		- # should not have been packaged by upstream).
49		- rm -rf $(OPSSL_SRC)/.git* $(OPSSL_SRC)/.travis*
	48	+ # Remove openssl .gitignore to follow nodejs .gitignore
	49	+ if [ -e $(GITIGNORE) ]; then rm $(GITIGNORE); fi
50	50	cd $(OPSSL_SRC); $(NO_WARN_ENV) CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@;
51	51	$(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@
52	52	# Confgure asm_avx2 and generate upto avx2 support

0 commit comments

Comments

0 (0)