diff --git a/debian/control b/debian/control index 36dd290c0..7eee77632 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: cmake, debhelper-compat (= 13), libkrb5-dev, - libhttp-parser-dev, + libllhttp-dev [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 ppc64], libmbedtls-dev, libpcre2-dev, libssh2-1-dev, @@ -30,7 +30,7 @@ Section: libdevel Multi-Arch: same Depends: libgit2-1.8 (= ${binary:Version}), - libllhttp-dev, + libllhttp-dev [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 ppc64], libmbedtls-dev, libpcre2-dev, libssh2-1-dev, diff --git a/debian/rules b/debian/rules index 4837507be..0e5b234bd 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,13 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpkg/architecture.mk + export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +ARCH_WITH_LLHTTP = amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x loong64 ppc64 + BUILD_TESTS = $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),OFF,ON) COMMON_CMAKE_FLAGS = \ -DBUILD_CLI=OFF \ @@ -20,10 +25,13 @@ COMMON_CMAKE_FLAGS = \ -DREGEX_BACKEND=pcre2 \ -DUSE_GSSAPI=ON \ -DUSE_HTTPS=mbedTLS \ - -DUSE_HTTP_PARSER=http-parser \ -DUSE_NTLMCLIENT=OFF \ -DUSE_SSH=ON +ifneq (,$(filter $(ARCH_WITH_LLHTTP),$(DEB_HOST_ARCH))) +COMMON_CMAKE_FLAGS += \ + -DUSE_HTTP_PARSER=llhttp +endif # The stat() in the Git fs layer has some issues export GITTEST_FLAKY_STAT = true @@ -47,6 +55,9 @@ override_dh_auto_install: dh_auto_install --builddirectory=build-debian-devel dh_auto_install --builddirectory=build-debian-release +execute_after_dh_auto_install: + + override_dh_auto_test: dh_auto_test --builddirectory=build-debian-devel dh_auto_test --builddirectory=build-debian-release