Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Cleanup patch for aarch64 support #1438

Merged
merged 1 commit into from
Aug 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ RUN wget -O /tmp/Python-${PYTHON_VERSION}.tgz https://www.python.org/ftp/python/

# Compile patchelf statically from source
RUN cd /tmp &&\
wget https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.gz &&\
wget https://nixos.org/releases/patchelf/patchelf-0.11/patchelf-0.11.tar.gz &&\
tar -xf patchelf*.tar.gz &&\
cd patchelf-0.10 &&\
cd patchelf-0.11* &&\
./configure LDFLAGS="-static" &&\
make &&\
make install
Expand Down
2 changes: 1 addition & 1 deletion scripts/patch-rpath
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ echo "Using final root directory of $root"

cd $root

for f in $(find bin lib jre -type f -executable -or -name "*.so*" | grep -v libc.so.6 | grep -v libpthread.so.0); do
for f in $(find bin lib jre -type f -executable -or -name "*.so*"); do
existing_rpath=$(patchelf --print-rpath $f 2>/dev/null || true)
patchelf --set-rpath '$ORIGIN/'$(/usr/bin/realpath --relative-to $(dirname $f) ${root%/}/lib):$existing_rpath $f 2>/dev/null || true
done