File tree Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Expand file tree Collapse file tree 2 files changed +5
-9
lines changed Original file line number Diff line number Diff line change @@ -270,16 +270,13 @@ RUN pyinstaller pyinstaller.spec \
270270 && test -f build/pyinstaller/warn-pyinstaller.txt \
271271 && ./check_pyinstaller.sh
272272
273- # for aarch64 - build a patched version of staticx 0.13.6. we remove calls to getpwnam and getgrnam, for these end up doing dlopen()s which
274- # crash the staticx bootloader. we don't need them anyway (all files in our staticx tar are uid 0 and we don't need the names translation)
273+ # for aarch64 - build a patched version of staticx
275274COPY scripts/staticx_patch.diff staticx_patch.diff
276- # TODO: fix me
277275# hadolint ignore=DL3003
278276RUN if [ "$(uname -m)" = "aarch64" ]; then \
279- git clone -b v0.13.6 https://github.com/JonathonReinhart/staticx.git && \
277+ git clone -b v0.14.1 https://github.com/JonathonReinhart/staticx.git && \
280278 cd staticx && \
281- git reset --hard 819d8eafecbaab3646f70dfb1e3e19f6bbc017f8 && \
282- git apply ../staticx_patch.diff && \
279+ git reset --hard 033d694a6fbf0ab0952cf0ff4a476269828167af && \
283280 ln -s libnss_files.so.2 /lib64/libnss_files.so && \
284281 ln -s libnss_dns.so.2 /lib64/libnss_dns.so && \
285282 python3 -m pip install --no-cache-dir . ; \
Original file line number Diff line number Diff line change @@ -55,13 +55,12 @@ if [ -n "$with_staticx" ]; then
5555 if [ " $( uname -m) " = " aarch64" ]; then
5656 exit 0;
5757 fi
58- git clone -b v0.13.6 https://github.com/JonathonReinhart/staticx.git
58+ git clone -b v0.14.1 https://github.com/JonathonReinhart/staticx.git
5959 # We're using staticx to build a distribution-independent binary of PyPerf because PyPerf
6060 # can only build with latest llvm (>10), which cannot be obtained on CentOS.
6161 cd staticx
62- git reset --hard 819d8eafecbaab3646f70dfb1e3e19f6bbc017f8
62+ git reset --hard 033d694a6fbf0ab0952cf0ff4a476269828167af
6363 # - apply patch to ensure staticx bootloader propagates dump signal to actual PyPerf binary
64- # - apply patch removing calls to getpwnam and getgrnam,
6564 # to avoid crashing the staticx bootloader on ubuntu:22.04+ and centos:8+
6665 git apply ../staticx_for_pyperf_patch.diff ../staticx_patch.diff
6766 python3 -m pip install --no-cache-dir .
You can’t perform that action at this time.
0 commit comments