Merge branch 'master' into 'master'

Drop kfreebsd-* specific build-depends, the ports have been removed

See merge request cmake-team/cmake!13
ci/unstable
Timo Röhling 7 months ago
commit 2cf9254138

1
debian/control vendored

@ -9,7 +9,6 @@ Uploaders:
Build-Depends:
debhelper-compat (= 13),
cmake <cross>,
freebsd-glue [kfreebsd-any],
libarchive-dev (>= 3.3.3) <!pkg.cmake.bootstrap>,
libcppdap-dev <!pkg.cmake.bootstrap>,
libcurl4-openssl-dev <!pkg.cmake.bootstrap> | libcurl-ssl-dev <!pkg.cmake.bootstrap>,

@ -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

7
debian/rules vendored

@ -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

Loading…
Cancel
Save