From ed2f5faffbb00112c06c1f55da0e0373cc744949 Mon Sep 17 00:00:00 2001 From: Aleksandr Vodyanov Date: Fri, 24 Jan 2025 16:12:47 +0300 Subject: [PATCH] [DO-0] fixed build with openssl (#6) Co-authored-by: aleksandr.vodyanov Reviewed-on: https://git.avroid.tech/Docker/tavro-build-linux/pulls/6 Reviewed-by: Vasiliy Chipizhin Reviewed-by: Denis Patrakeev --- CHANGELOG.md | 8 ++++++++ Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60b6b78..9923c69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 1.5 + +### 24.01.2025 + +ADD: + +* Отключена опция сборки без openssl в qt + ## 1.4 ### 09.10.2024 diff --git a/Dockerfile b/Dockerfile index 2646019..3a03d50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,7 +61,7 @@ RUN wget ${NEXUS_URL}/repository/${NEXUS_QT_REPO}/v${VERSION}/qt-everywhere-open sed -i '7i #include ' qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp && \ sed -i '4i #include ' 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 #Ужасный костыль diff --git a/Makefile b/Makefile index 04800ef..8ed0b17 100644 --- a/Makefile +++ b/Makefile @@ -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 =