Skip to content

Commit 73a3a6d

Browse files
committed
feat: Add arm64 build support
1 parent f8ad672 commit 73a3a6d

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

Dockerfile.linux

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,7 @@ RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-1.16.2.tar.gz && \
185185
make -j$THREADS install && \
186186
rm -rf $(pwd)
187187

188-
RUN rm /usr/lib/x86_64-linux-gnu/libX11.a && \
189-
rm /usr/lib/x86_64-linux-gnu/libXext.a && \
190-
rm /usr/lib/x86_64-linux-gnu/libX11-xcb.a && \
191-
git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
188+
RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
192189
cd qt5 && \
193190
git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
194191
git clone git://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \
@@ -206,7 +203,7 @@ RUN rm /usr/lib/x86_64-linux-gnu/libX11.a && \
206203
sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
207204
sed -ri s/\(Libs:.*\)/\\1\ -lXau/ /usr/local/lib/pkgconfig/xcb.pc && \
208205
sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf && \
209-
./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \
206+
./configure --prefix=/usr -opensource -confirm-license -release -static -no-avx \
210207
-opengl desktop -qpa xcb -xcb -xcb-xlib -feature-xlib -system-freetype -fontconfig -glib \
211208
-no-dbus -no-feature-qml-worker-script -no-linuxfb -no-openssl -no-sql-sqlite -no-kms -no-use-gold-linker \
212209
-qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ release-linux-ppc64le:
5454
mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="ppc64le" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
5555
5656
release-static:
57-
mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
57+
mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="arm64" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
5858
5959
debug-static-win64:
6060
mkdir -p $(builddir)/debug && cd $(builddir)/debug && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Debug -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)

0 commit comments

Comments
 (0)