Package: cryfs
Version: 0.11.4-2
Severity: minor

Dear maintainer,

cryfs takes a significant time to build, as it doesn't build things in
parallel, despite upstream build system (cmake) supports that. In
addition it always run the testsuite even when using nocheck.

The patch below fixes that by overriding dh_auto_test instead of
dh_auto_build, and calling dh_auto_configure instead of calling cmake
directly.

Regards
Aurelien


diff -Nru cryfs-0.11.4/debian/rules cryfs-0.11.4/debian/rules
--- cryfs-0.11.4/debian/rules   2024-07-01 18:48:33.000000000 +0200
+++ cryfs-0.11.4/debian/rules   2024-11-05 18:36:19.000000000 +0100
@@ -1,20 +1,19 @@
 #!/usr/bin/make -f
 
 %:
-       dh $@
+       dh $@ --builddirectory=build
 
 override_dh_auto_configure:
        mkdir -p build
        dpkg-architecture
        if `dpkg-architecture -e armel` || `dpkg-architecture -e armhf` || 
`dpkg-architecture -e s390x`; then \
            echo "Performing armel build"; \
-           (cd build && cmake .. -DDISABLE_ASM=ON 
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake 
-DBUILD_TESTING=ON -DCRYFS_UPDATE_CHECKS=OFF); \
+           dh_auto_configure -- -DDISABLE_ASM=ON 
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake 
-DBUILD_TESTING=ON -DCRYFS_UPDATE_CHECKS=OFF; \
        else \
-           (cd build && cmake .. 
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake 
-DBUILD_TESTING=ON -DCRYFS_UPDATE_CHECKS=OFF); \
+           dh_auto_configure -- 
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake 
-DBUILD_TESTING=ON -DCRYFS_UPDATE_CHECKS=OFF; \
        fi
 
-override_dh_auto_build:
-       (cd build && make VERBOSE=1)
+override_dh_auto_test:
        ./build/test/blobstore/blobstore-test 2>&1
        ./build/test/blockstore/blockstore-test 
--gtest_filter='-CacheTest_RaceCondition.*' 2>&1
        # Config Compatibility tests fail on s390x, mipsel, and hppa archs

Reply via email to