FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

build,deps: add gen-openssl target · nodejs/node@755f9e4 · GitHub

/ node Public

Commit 755f9e4

Browse files
evanlucas
authored and
richardlau
committed
build,deps: add gen-openssl target
This adds a new make target to generate platform dependent files for openssl on non-linux machines. The scripts we currently have in place require linux. This adds a Dockerfile that installs the necessary dependencies to be able to generate these files. Previously, it was necessary to run `make -C deps/openssl/config` on a linux machine. Now, as long as docker is installed and in your `PATH`, it is possible to run `make gen-openssl`. PR-URL: #34642 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 4cf93bb commit 755f9e4

3 files changed

Lines changed: 32 additions & 0 deletions

File tree

‎Makefile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,3 +1406,19 @@ endif
14061406
lint-clean:
14071407
$(RM) tools/.*lintstamp
14081408
$(RM) .eslintcache
1409+
1410+
HAS_DOCKER ?= $(shell which docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
1411+
1412+
ifeq ($(HAS_DOCKER), 1)
1413+
DOCKER_COMMAND ?= docker run -it -v $(PWD):/node
1414+
IS_IN_WORKTREE = $(shell grep '^gitdir: ' $(PWD)/.git 2>/dev/null)
1415+
GIT_WORKTREE_COMMON = $(shell git rev-parse --git-common-dir)
1416+
DOCKER_COMMAND += $(if $(IS_IN_WORKTREE), -v $(GIT_WORKTREE_COMMON):$(GIT_WORKTREE_COMMON))
1417+
gen-openssl: ## Generate platform dependent openssl files (requires docker)
1418+
docker build -t node-openssl-builder deps/openssl/config/
1419+
$(DOCKER_COMMAND) node-openssl-builder make -C deps/openssl/config
1420+
else
1421+
gen-openssl:
1422+
@echo "No docker command, cannot continue"
1423+
@exit 1
1424+
endif

‎deps/openssl/config/Dockerfile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM ubuntu:20.04
2+
3+
VOLUME /node
4+
5+
RUN buildDeps='binutils build-essential vim nasm git' \
6+
&& apt-get update \
7+
&& apt-get install -y --no-install-recommends --force-yes $buildDeps \
8+
&& apt-get clean \
9+
&& apt-get autoremove -y \
10+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
11+
12+
WORKDIR /node

‎doc/guides/maintaining-openssl.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ This updates all sources in deps/openssl/openssl by:
5858
Use `make` to regenerate all platform dependent files in
5959
`deps/openssl/config/archs/`:
6060
```console
61+
# On non-linux machines
62+
% make gen-openssl
63+
64+
# On Linux machine
6165
% make -C deps/openssl/config
6266
```
6367

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL