Skip to content

Commit 1985790

Browse files
committed
remove support for v16 and v18 as they are unsupported
1 parent 9cd5751 commit 1985790

3 files changed

Lines changed: 0 additions & 66 deletions

File tree

recipes/arm64-musl/51256-v16.diff

Lines changed: 0 additions & 29 deletions
This file was deleted.

recipes/arm64-musl/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ RUN apk add --no-cache \
2222
ccache \
2323
xz \
2424
patch \
25-
# this is required to support building v16 on python 3.12
26-
py3-packaging \
2725
# extra packages required for creating the musl bases cross-compiler
2826
rsync make gcc g++ bzip2 git
2927

@@ -42,7 +40,6 @@ RUN git clone https://github.com/richfelker/musl-cross-make /musl-cross-make &&
4240
rm -rf /musl-cross-make
4341

4442
COPY --chown=node:node run.sh /home/node/run.sh
45-
COPY --chown=node:node 51256-v16.diff /home/node/51256-v16.diff
4643

4744
VOLUME /home/node/.ccache
4845
VOLUME /out

recipes/arm64-musl/run.sh

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,6 @@ cd /home/node
1717
tar -xf node.tar.xz
1818
cd "node-${fullversion}"
1919

20-
major=$(echo ${fullversion} | cut -d . -f 1 | tr -d v)
21-
22-
# Patch needed to support cross compilation for arm64 on amd64 for node 16 and 18.
23-
# The PR introducing the issue (https://github.com/nodejs/node/pull/43200) was merged in main released in v20 and backported to v18 (https://github.com/nodejs/node/pull/44353) and v16 (https://github.com/nodejs/node/pull/44886)
24-
# The fix for the issue (https://github.com/nodejs/node/pull/51256) was only merged into v20 (https://github.com/nodejs/node/pull/52793)
25-
# Therefore the fix needs to be re-applied to v16 and v18 if we want to compile those too.
26-
# the initial patch works on v18, for v16 a reroll was required.
27-
# @see https://github.com/nodejs/node/pull/51256
28-
if [ "$major" == "18" ]; then
29-
wget -O /home/node/51256.diff https://patch-diff.githubusercontent.com/raw/nodejs/node/pull/51256.diff
30-
patch -p1 < /home/node/51256.diff || true
31-
elif [ "$major" == "16" ]; then
32-
patch -p1 < /home/node/51256-v16.diff || true
33-
rm /home/node/51256-v16.diff
34-
fi
35-
36-
# Patch needed so we can depend on newer Python versions for older NodeJS versions.
37-
# This allows us to use the same Dockerfile and Alpine version.
38-
if [ "$major" == "18" ] || [ "$major" == "16" ] ; then
39-
wget -O /home/node/50209.diff https://patch-diff.githubusercontent.com/raw/nodejs/node/pull/50209.diff
40-
patch -p1 < /home/node/50209.diff || true
41-
fi
42-
43-
# For v16, and additional patch is needed to replace the dependency on distutils, as it was removed in Python 3.12
44-
# There is both usage of distutils in node itself, and in the gyp dependency.
45-
# This also requires the packaging module, which is installed in the Dockerfile (see py3-packaging)
46-
if [ "$major" == "16" ] ; then
47-
wget -O /home/node/50582.diff https://patch-diff.githubusercontent.com/raw/nodejs/node/pull/50582.diff
48-
patch -p1 < /home/node/50582.diff || true
49-
50-
wget -O /home/node/2888.diff https://patch-diff.githubusercontent.com/raw/nodejs/node-gyp/pull/2888.diff
51-
patch -d tools -p1 < /home/node/2888.diff
52-
fi
53-
5420
export CC_host="ccache gcc"
5521
export CXX_host="ccache g++"
5622
export CC="ccache /opt/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc"

0 commit comments

Comments
 (0)