Skip to content

Commit 8898f0c

Browse files
committed
Add patchelf to builder
1 parent 84e7bdd commit 8898f0c

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.github/builder/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ RUN yum -y update && \
99
gcc \
1010
gcc-c++ \
1111
make \
12-
patchelf && \
1312
yum clean all
1413

1514
COPY .github/builder/rsrc/rustup-init /install/rustup-init
1615
COPY .github/builder/rsrc/make-4.4.1.tar.gz /install/make-4.4.1.tar.gz
1716
COPY .github/builder/rsrc/cmake-3.28.0-rc5-linux-x86_64.tar.gz /install/cmake-3.28.0-rc5-linux-x86_64.tar.gz
1817
COPY .github/builder/rsrc/llvm-5.0.2.src.tar.xz /install/llvm-5.0.2.src.tar.xz
1918
COPY .github/builder/rsrc/cfe-5.0.2.src.tar.xz /install/cfe-5.0.2.src.tar.xz
19+
COPY .github/builder/rsrc/patchelf-0.18.0-x86_64.tar.gz /install/patchelf-0.18.0-x86_64.tar.gz
2020

2121
RUN chmod +x /install/rustup-init && \
2222
/install/rustup-init -y --default-toolchain nightly && \
@@ -40,11 +40,11 @@ RUN chmod +x /install/rustup-init && \
4040
make clean && \
4141
rm -rf /llvm/build/ && \
4242
popd && \
43-
rm -rf /make /llvm
43+
rm -rf /make /llvm && \
44+
tar -C /usr/local/ --strip-components=1 -xf /install/patchelf-0.18.0-x86_64.tar.gz
4445

4546
WORKDIR /
4647

47-
4848
ARG PUBLIC_SIMICS_PACKAGE_VERSION_1000
4949
ENV PATH="${PATH}:/simics/ispm/"
5050
ENV PATH="${PATH}:/root/.cargo/bin/"

.github/builder/build.sh

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ LLVM_SRC_URL="https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz"
77
MAKE_SRC_URL="https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz"
88
RUSTUP_INIT_URL="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init"
99
CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v3.28.0-rc5/cmake-3.28.0-rc5-linux-x86_64.tar.gz"
10+
PATCHELF_URL="https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-x86_64.tar.gz"
1011
PUBLIC_SIMICS_PKGS_URL="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/ead79ef5-28b5-48c7-8d1f-3cde7760798f/simics-6-packages-2024-05-linux64.ispm"
1112
PUBLIC_SIMICS_ISPM_URL="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/ead79ef5-28b5-48c7-8d1f-3cde7760798f/intel-simics-package-manager-1.8.3-linux64.tar.gz"
1213
PUBLIC_SIMICS_PACKAGE_VERSION_1000="6.0.185"
@@ -56,6 +57,11 @@ if [ ! -f "${BUILDER_DIR}/rsrc/cmake-3.28.0-rc5-linux-x86_64.tar.gz" ]; then
5657
"${CMAKE_URL}"
5758
fi
5859

60+
if [ ! -f "${BUILDER_DIR}/rsrc/patchelf-0.18.0-x86_64.tar.gz" ]; then
61+
curl --noproxy '*.intel.com' -L -o "${BUILDER_DIR}/rsrc/patchelf-0.18.0-x86_64.tar.gz" \
62+
"${CMAKE_URL}"
63+
fi
64+
5965
unset SIMICS_BASE
6066
docker build \
6167
--build-arg \

scripts/build.sh

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ LLVM_SRC_URL="https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz"
88
MAKE_SRC_URL="https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz"
99
RUSTUP_INIT_URL="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init"
1010
CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v3.28.0-rc5/cmake-3.28.0-rc5-linux-x86_64.tar.gz"
11+
PATCHELF_URL="https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-x86_64.tar.gz"
1112
PUBLIC_SIMICS_PKGS_URL="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/ead79ef5-28b5-48c7-8d1f-3cde7760798f/simics-6-packages-2024-05-linux64.ispm"
1213
PUBLIC_SIMICS_ISPM_URL="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/ead79ef5-28b5-48c7-8d1f-3cde7760798f/intel-simics-package-manager-1.8.3-linux64.tar.gz"
1314
PUBLIC_SIMICS_PACKAGE_VERSION_1000="6.0.185"
@@ -56,6 +57,10 @@ if [ ! -f "${BUILDER_DIR}/rsrc/cmake-3.28.0-rc5-linux-x86_64.tar.gz" ]; then
5657
"${CMAKE_URL}"
5758
fi
5859

60+
if [ ! -f "${BUILDER_DIR}/rsrc/patchelf-0.18.0-x86_64.tar.gz" ]; then
61+
curl --noproxy '*.intel.com' -L -o "${BUILDER_DIR}/rsrc/patchelf-0.18.0-x86_64.tar.gz" \
62+
"${CMAKE_URL}"
63+
fi
5964

6065
unset SIMICS_BASE
6166
docker build \

0 commit comments

Comments
 (0)