Source: vulkan-loader
Version: 1.1.101.0-2
Severity: important
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
vulkan-loader Build-Depends on googletest, which Build-Depends on cmake,
which uses qt, which libvulkan1. This is bad for bootstrapping.
Fortunately, the dependency on googletest can be made optional using
DEB_BUILD_OPTIONS=nocheck. The attached patch implements that. Using
reproducible builds, I verified that it does not affect the outcome of
the build. Please consider applying it.
Helmut
diff --minimal -Nru vulkan-loader-1.1.101.0/debian/changelog
vulkan-loader-1.1.101.0/debian/changelog
--- vulkan-loader-1.1.101.0/debian/changelog 2019-03-12 17:38:57.000000000
+0100
+++ vulkan-loader-1.1.101.0/debian/changelog 2019-05-09 07:23:31.000000000
+0200
@@ -1,3 +1,10 @@
+vulkan-loader (1.1.101.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Support DEB_BUILD_OPTIONS=nocheck to drop googletest. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 09 May 2019 07:23:31 +0200
+
vulkan-loader (1.1.101.0-2) unstable; urgency=medium
* rules: Enable tests, but expect most of them to fail since there's
diff --minimal -Nru vulkan-loader-1.1.101.0/debian/control
vulkan-loader-1.1.101.0/debian/control
--- vulkan-loader-1.1.101.0/debian/control 2019-03-12 17:32:23.000000000
+0100
+++ vulkan-loader-1.1.101.0/debian/control 2019-05-09 07:23:31.000000000
+0200
@@ -4,7 +4,7 @@
Uploaders: Timo Aaltonen <tjaal...@debian.org>
Build-Depends: debhelper (>= 11),
cmake,
- googletest,
+ googletest <!nocheck>,
libwayland-dev,
libx11-dev,
libxcb1-dev,
diff --minimal -Nru vulkan-loader-1.1.101.0/debian/rules
vulkan-loader-1.1.101.0/debian/rules
--- vulkan-loader-1.1.101.0/debian/rules 2019-03-12 17:35:21.000000000
+0100
+++ vulkan-loader-1.1.101.0/debian/rules 2019-05-09 07:23:31.000000000
+0200
@@ -17,7 +17,9 @@
rm -f external/googletest
override_dh_auto_configure:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
ln -s /usr/src/googletest external
+endif
dh_auto_configure -- \
-DCMAKE_BUILD_TYPE=Release \
@@ -27,8 +29,10 @@
-DVulkanRegistry_DIR=../vulkan-headers/registry
override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
(cd build; tests/run_all_tests.sh || \
echo "NOTE: 23 tests expected to fail without a vulkan driver")
+endif
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
