Skip to content

Commit 2590926

Browse files
committed
Docker: set LANG=C.UTF-8
This prevents warning spam from Qt 6's rcc tool.
2 parents 87266b7 + a15e7ba commit 2590926

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# See Dockerfile.win for an explanation of some aspects of this file.
22
FROM docker.io/debian:bullseye-slim
3+
4+
# Prevents warning spam from Qt 6's rcc
5+
ENV LANG=C.UTF-8
6+
37
# OpenSSL build requires perl
48
# Qt tarball requires xz-utils
59
# Qt build requires libgl1-mesa-dev, libxkbcommon-dev, python, zlib1g-dev
@@ -38,7 +42,7 @@ RUN curl -LO http://github.com/openssl/openssl/releases/download/openssl-3.6.0/o
3842
sha256sum --check sha256sums-openssl.txt
3943
RUN tar -xzf openssl-3.6.0.tar.gz
4044
WORKDIR /build-ssl/openssl-3.6.0
41-
RUN ./config --prefix=/openssl --openssldir=/dev/null no-shared no-apps no-autoload-config no-capieng no-dso no-dynamic-engine no-engine no-loadereng no-module
45+
RUN ./config --prefix=/openssl --openssldir=/dev/null no-shared no-apps no-autoload-config no-capieng no-dso no-dynamic-engine no-engine no-loadereng no-module -Os
4246
RUN make -j`nproc` && make install_sw && rm -rf /build-ssl
4347

4448
############
@@ -62,7 +66,8 @@ COPY aria2 /updater/aria2
6266
COPY .git/modules/aria2 /updater/.git/modules/aria2
6367
COPY build-aria.sh /updater/
6468
WORKDIR /updater/aria2
65-
RUN OPENSSL_LIBS='-L/openssl/lib64 -lssl -lcrypto -lpthread -ldl' OPENSSL_CFLAGS='-I /openssl/include' ../build-aria.sh --with-openssl
69+
RUN OPENSSL_LIBS='-L/openssl/lib64 -lssl -lcrypto -lpthread -ldl' OPENSSL_CFLAGS='-I /openssl/include' \
70+
CFLAGS=-Os CXXFLAGS=-Os ../build-aria.sh --with-openssl
6671

6772
#################
6873
# Build updater #

Dockerfile.win

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
# is stored in the updater/.git/modules directory.
1212

1313
FROM docker.io/debian:bullseye-slim
14+
15+
# Prevents warning spam from Qt 6's rcc
16+
ENV LANG=C.UTF-8
17+
1418
RUN apt-get update && apt-get install -y \
1519
autoconf \
1620
autopoint \
@@ -52,7 +56,7 @@ COPY .git/modules/aria2 /updater/.git/modules/aria2
5256
COPY build-aria.sh /updater/
5357
WORKDIR /updater/aria2
5458
RUN git clean -dXff
55-
RUN ../build-aria.sh ARIA2_STATIC=yes --host i686-w64-mingw32
59+
RUN CFLAGS=-Os CXXFLAGS=-Os ../build-aria.sh ARIA2_STATIC=yes --host i686-w64-mingw32
5660

5761
#################
5862
# Build updater #

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ brew install autoconf automake libtool pkg-config gettext
7575
cd aria2
7676
# If building on M1, target x86 by running in Rosetta: arch -x86_64 ../build-aria.sh
7777
# (the --target option to configure doesn't seem to have any effect)
78-
../build-aria.sh
78+
CFLAGS=-Os CXXFLAGS=-Os ../build-aria.sh
7979
cd ..
8080
```
8181

0 commit comments

Comments
 (0)