Skip to content

Commit f4582dd

Browse files
committed
Change lld repository to trixie-backports
1 parent 1777347 commit f4582dd

4 files changed

Lines changed: 12 additions & 44 deletions

File tree

alpine/Dockerfile

Lines changed: 1 addition & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

alpine/Dockerfile.j2

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ ARG REDISJSON_VERSION
2424
ARG REDISBLOOM_VERSION
2525
ARG REDISTIMESERIES_VERSION
2626
{% endif -%}
27-
# 1 = enable link-time optimization for bundled modules (e.g. RediSearch), 0 = off. Override with: docker build --build-arg LTO=0
28-
ARG LTO=1
2927

3028
RUN set -eux; \
3129
\
@@ -125,15 +123,8 @@ RUN set -eux; \
125123
export RUST_DYN_CRT=1; \
126124
export PATH="/usr/lib/llvm21/bin:$PATH"; \
127125
export BUILD_TLS=yes; \
128-
if [ "$BUILD_WITH_MODULES" = "yes" ] && [ "${LTO}" = "1" ]; then \
129-
mkdir -p /usr/local/bin; \
130-
ln -sf /usr/lib/llvm21/bin/clang-21 /usr/local/bin/clang-21; \
131-
ln -sf /usr/lib/llvm21/bin/clang++-21 /usr/local/bin/clang++-21; \
132-
ln -sf /usr/lib/llvm21/bin/lld /usr/local/bin/lld; \
133-
[ -x /usr/lib/llvm21/bin/lld-21 ] && ln -sf /usr/lib/llvm21/bin/lld-21 /usr/local/bin/lld-21; \
134-
fi; \
135126
if [ "$BUILD_WITH_MODULES" = "yes" ]; then \
136-
export LTO=${LTO}; \
127+
export LTO=1; \
137128

138129
{%- if custom_build %}
139130

debian/Dockerfile

Lines changed: 5 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

debian/Dockerfile.j2

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ ARG REDISJSON_VERSION
2424
ARG REDISBLOOM_VERSION
2525
ARG REDISTIMESERIES_VERSION
2626
{% endif %}
27-
# 1 = enable link-time optimization for bundled modules (e.g. RediSearch), 0 = off. Override with: docker build --build-arg LTO=0
28-
ARG LTO=1
2927

3028
RUN set -eux; \
3129
\
@@ -48,6 +46,7 @@ RUN set -eux; \
4846
*) echo >&2 "Modules are NOT supported! unsupported architecture: '$arch'"; export BUILD_WITH_MODULES=no ;; \
4947
esac; \
5048
if [ "$BUILD_WITH_MODULES" = "yes" ]; then \
49+
echo 'deb http://deb.debian.org/debian trixie-backports main' > /etc/apt/sources.list.d/backports.list; \
5150
apt-get update; \
5251
apt-get install -y --no-install-recommends \
5352
git \
@@ -58,21 +57,15 @@ RUN set -eux; \
5857
python3-dev \
5958
unzip \
6059
rsync \
61-
clang \
6260
automake \
6361
autoconf \
6462
libtool \
6563
g++; \
66-
if [ "${LTO}" = "1" ]; then \
67-
install -d /etc/apt/keyrings; \
68-
wget -qO /etc/apt/keyrings/llvm.asc https://apt.llvm.org/llvm-snapshot.gpg.key; \
69-
echo "deb [signed-by=/etc/apt/keyrings/llvm.asc] http://apt.llvm.org/trixie/ llvm-toolchain-trixie-21 main" > /etc/apt/sources.list.d/llvm.list; \
70-
apt-get update; \
71-
apt-get install -y --no-install-recommends clang-21 lld-21 llvm-21; \
72-
export PATH="/usr/lib/llvm-21/bin:$PATH"; \
73-
fi; \
64+
apt-get install -y --no-install-recommends -t trixie-backports clang-21 lld-21 llvm-21; \
65+
export PATH="/usr/lib/llvm-21/bin:$PATH"; \
7466
fi; \
7567
\
68+
rm -f /etc/apt/sources.list.d/backports.list; \
7669
rm -rf /var/lib/apt/lists/*; \
7770
\
7871
wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
@@ -132,7 +125,7 @@ RUN set -eux; \
132125
\
133126
export BUILD_TLS=yes; \
134127
if [ "$BUILD_WITH_MODULES" = "yes" ]; then \
135-
export LTO=${LTO}; \
128+
export LTO=1; \
136129
fi; \
137130
make -C /usr/src/redis -j "$(nproc)" all; \
138131
make -C /usr/src/redis install; \

0 commit comments

Comments
 (0)