File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ FROM builder-base AS builder-static
1313RUN dnf install -y glibc-static
1414
1515ARG musl_version=1.2.5
16- ARG bash_version=5.1.16
16+ ARG bash_version=5.2.15
1717
1818WORKDIR /opt/build
1919COPY ./sdk-fetch ./
@@ -47,8 +47,11 @@ RUN CC=""/usr/local/musl/bin/musl-gcc CFLAGS="-Os -DHAVE_DLOPEN=0" \
4747 --enable-static-link \
4848 --without-bash-malloc \
4949 || { cat config.log; exit 1; }
50+
51+ # Build bash library first, then remove conflicting strtoimax object to avoid duplicate symbols with musl
5052RUN make lib/sh/libsh.a && \
51- cd ./lib/sh && ar d libsh.a strtoimax.o && ranlib libsh.a
53+ ar d lib/sh/libsh.a lib/sh/strtoimax.o && \
54+ ranlib lib/sh/libsh.a
5255RUN make -j`nproc`
5356RUN cp bash /opt/bash
5457RUN mkdir -p /usr/share/licenses/bash && \
Original file line number Diff line number Diff line change 1- # https://ftp.gnu.org/gnu/bash/bash-5.1.16 .tar.gz
2- SHA512 (bash-5.1.16 .tar.gz) = a32a343b6dde9a18eb6217602655f72c4098b0d90f04cf4e686fb21b81fc4ef26ade30f7226929fbb7c207cde34617dbad2c44f6103161d1141122bb31dc6c80
1+ # https://ftp.gnu.org/gnu/bash/bash-5.2.15 .tar.gz
2+ SHA512 (bash-5.2.15 .tar.gz) = 08a67f6da4af7a75ff2b2d5a9eb8fc46d8c6e9ae80ccaf73b51736d6609916861b1f3fced938ce3ea16d014edb324e1a3d8e03f4917f68dc56ffb665316f26c7
You can’t perform that action at this time.
0 commit comments