From 7b849a5f871941a55ecda6e68bfca614d2ac2c20 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sun, 2 Jun 2024 14:38:37 +0200 Subject: [PATCH] Drop kfreebsd-* specific build-depends, the ports have been removed --- debian/control | 1 - debian/debtoolchainfilegen | 1 - debian/rules | 7 +------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/debian/control b/debian/control index d4fc05c2e..7e8b3618d 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Uploaders: Build-Depends: debhelper-compat (= 13), cmake , - freebsd-glue [kfreebsd-any], libarchive-dev (>= 3.3.3) , libcppdap-dev , libcurl4-openssl-dev | libcurl-ssl-dev , diff --git a/debian/debtoolchainfilegen b/debian/debtoolchainfilegen index 27cf8eeb2..213c6537c 100755 --- a/debian/debtoolchainfilegen +++ b/debian/debtoolchainfilegen @@ -41,7 +41,6 @@ DEB_HOST_GNU_TYPE=$(dpkg-architecture -f "-a$1" -qDEB_HOST_GNU_TYPE) DEB_HOST_GNU_CPU=$(dpkg-architecture -f "-a$1" -qDEB_HOST_GNU_CPU) case "$(dpkg-architecture -f "-a$1" -qDEB_HOST_ARCH_OS)" in linux) system_name=Linux; ;; - kfreebsd) system_name=kFreeBSD; ;; hurd) system_name=GNU; ;; *) exit 1; ;; esac diff --git a/debian/rules b/debian/rules index 6454bce89..e835707a2 100755 --- a/debian/rules +++ b/debian/rules @@ -71,12 +71,7 @@ else $(CROSS_CMAKE_FLAGS) endif -ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) - # Workaround for Bug #815231: skip spuriously failing tests - EXCLUDED_TESTS = CTestTestUpload\|curl\|kwsys.testSystemTools\|BuildDepends\|RunCMake.Configure -else - EXCLUDED_TESTS = CTestTestUpload\|curl -endif +EXCLUDED_TESTS = CTestTestUpload\|curl override_dh_auto_test: # Pass -j1 to "make test" as a workaround, see https://gitlab.kitware.com/cmake/cmake/issues/17165