switch to GCC 14.2.0 to support node v22+

Author: mollux

recipes/arm64-musl/55596.diff

@@ -23,14 +23,25 @@ RUN apk add --no-cache \
         xz \
         patch \
         # this is required to support building v16 on python 3.12
-        py3-packaging
-
-RUN cd /opt \
-    && curl -O https://musl.cc/aarch64-linux-musl-cross.tgz \
-    && tar xzf aarch64-linux-musl-cross.tgz
+        py3-packaging \
+        # extra packages required for creating the musl bases cross-compiler 
+        rsync make gcc g++ bzip2 git
+
+COPY <<-EOF /config/config.mak
+  # We only set the variables that are really needed, others are the sane defaults from the repo itself
+  TARGET = aarch64-linux-musl
+  GCC_VER = 14.2.0
+  OUTPUT = /opt/aarch64-linux-musl-cross
+EOF
+
+RUN git clone https://github.com/richfelker/musl-cross-make /musl-cross-make && \
+    cd /musl-cross-make && \
+    make -I /config -j$(getconf _NPROCESSORS_ONLN) && \
+    make -I /config install && \
+    cd / && \
+    rm -rf /musl-cross-make
 
 COPY --chown=node:node run.sh /home/node/run.sh
-COPY --chown=node:node 55596.diff /home/node/55596.diff
 COPY --chown=node:node 51256-v16.diff /home/node/51256-v16.diff
 
 VOLUME /home/node/.ccache

recipes/arm64-musl/Dockerfile

@@ -51,14 +51,6 @@ if [ "$major" == "16" ] ; then
   patch -d tools -p1 < /home/node/2888.diff
 fi
 
-# Patch needed to support compilation of Node 22 using musl
-# @see https://github.com/nodejs/node/issues/55596#issuecomment-2451411974
-# Although the GCC version in Alpine 3.22 is 14, The musl toolchain used is compiled using 11.2 (see https://musl.cc/)
-# recompiling musl is a step too far, so we add a simple patch that allows us to compile v22
-if [ "$major" == "22" ]; then
-  patch -p1 < /home/node/55596.diff
-fi
-
 export CC_host="ccache gcc"
 export CXX_host="ccache g++"
 export CC="ccache /opt/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc"