diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index c8fcb6e95d..5d012af7fb 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -16,7 +16,7 @@ concurrency: jobs: source-bundle: name: Source Bundle - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout sources uses: actions/checkout@v4 @@ -35,9 +35,7 @@ jobs: - name: Build source bundle shell: bash - env: - GITREF: ${{github.ref}} - run: ./scripts/linux/script.sh --source --gitref ${GITREF} + run: ./scripts/linux/script.sh --source --gitref ${{github.ref}} - name: Upload source bundle uses: actions/upload-artifact@v4 diff --git a/linux/debian/rules b/linux/debian/rules index 9c4e0795a6..492cac2f75 100755 --- a/linux/debian/rules +++ b/linux/debian/rules @@ -11,13 +11,22 @@ ifneq (ok,$(shell dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 2:1.18 && export PATH := $(GODIR)/bin:$(PATH) endif +# Check Qt features. +QT_INSTALL_HEADERS := $(shell pkg-config --variable=includedir Qt6Core || qmake6 -query QT_INSTALL_HEADERS || true) +qtfeature = $(shell test -d "$(QT_INSTALL_HEADERS)" && echo "$(1)" | gcc -I "$(QT_INSTALL_HEADERS)" -include QtCore/qconfig.h -E - | grep -e '^[[:alnum:]_-]') +ifeq (1,$(call qtfeature,QT_FEATURE_static)) +ifeq (1,$(call qtfeature,QT_FEATURE_openssl_linked)) + OPENSSL_BUILD_ARGS := -DOPENSSL_USE_STATIC_LIBS=ON +endif +endif + CMAKE_BUILD_DIR := build-$(DEB_HOST_MULTIARCH) %: dh $@ --with=systemd --buildsystem=cmake+ninja --builddirectory=$(CMAKE_BUILD_DIR) --warn-missing override_dh_auto_configure: - dh_auto_configure -- -DWEBEXT_INSTALL_LIBDIR=/lib -DBUILD_ID=$(DEB_VERSION) -DBUILD_TESTS=OFF + dh_auto_configure -- -DWEBEXT_INSTALL_LIBDIR=/lib -DBUILD_ID=$(DEB_VERSION) -DBUILD_TESTS=OFF ${OPENSSL_BUILD_ARGS} override_dh_auto_test: