[DO-0] fixed build with openssl (#6)

Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Reviewed-on: https://git.avroid.tech/Docker/tavro-build-linux/pulls/6
Reviewed-by: Vasiliy Chipizhin <vasiliy.chipizhin@avroid.team>
Reviewed-by: Denis Patrakeev <denis.patrakeev@avroid.team>
This commit is contained in:
Aleksandr Vodyanov
2025-01-24 16:12:47 +03:00
parent e8d542bd25
commit ed2f5faffb
3 changed files with 10 additions and 2 deletions

View File

@@ -1,5 +1,13 @@
# Changelog
## 1.5
### 24.01.2025
ADD:
* Отключена опция сборки без openssl в qt
## 1.4
### 09.10.2024

View File

@@ -61,7 +61,7 @@ RUN wget ${NEXUS_URL}/repository/${NEXUS_QT_REPO}/v${VERSION}/qt-everywhere-open
sed -i '7i #include <cstdint>' qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp && \
sed -i '4i #include <cstdint>' qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp && \
#configure and build qt \
./configure -release -opensource -confirm-license -nomake tests -nomake examples -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtdoc -skip qtmacextras -skip qtscript -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview -skip qtwinextras -skip qtserialbus -xkbcommon -system-harfbuzz -system-libjpeg -no-openssl && \
./configure -release -opensource -confirm-license -nomake tests -nomake examples -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtdoc -skip qtmacextras -skip qtscript -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview -skip qtwinextras -skip qtserialbus -xkbcommon -system-harfbuzz -system-libjpeg && \
make -j$(nproc) && make install -j$(nproc) && cd .. && rm -rf qt-everywhere* /tmp/patches
#Ужасный костыль

View File

@@ -2,7 +2,7 @@
IMAGE_NAME = tavro-build-linux
IMAGE_GROUP = tavro
IMAGE_TAG = 1.4
IMAGE_TAG = 1.5
REVISION =
DOCKER_REGISTRY = harbor.avroid.tech
CI_FLAGS =