Allow building without libgtest-dev under <nocheck> build profile

I'd like to avoid pulling libgtest-dev into the bootstrap set.

Fortunately, libgtest-dev is only used for testing apt and apt
correctly implements DEB_BUILD_OPTIONS=nocheck now. So this
bug is about getting rid of the Build-Depends.

Simply removing it (by adding a build profile) is not sufficient
however as configure fails hard, so an additional bit is necessary
to cover for that.

Closes: #809726

diff --git a/debian/control b/debian/control
index bb5bf87ae693c4cc81e04f4fcf2467f55339c65e..d36b977438a3185cdb1121bc5c3a9331b6ba0464 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
  zlib1g-dev, libbz2-dev, liblzma-dev,
  xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2),
  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
  zlib1g-dev, libbz2-dev, liblzma-dev,
  xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2),

- autotools-dev, autoconf, automake, libgtest-dev,
+ autotools-dev, autoconf, automake, libgtest-dev <!nocheck>,

  g++ (>= 4:5.2)
 Build-Depends-Indep: doxygen, w3m, graphviz
 Build-Conflicts: autoconf2.13, automake1.4
  g++ (>= 4:5.2)
 Build-Depends-Indep: doxygen, w3m, graphviz
 Build-Conflicts: autoconf2.13, automake1.4

diff --git a/debian/rules b/debian/rules
index c8e7cb285bed743f8ac9afbae0e645d5ef86387d..ce7d19dec4529c1785cc79c0fd1d31f7d8cf91fd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,11 @@ ifeq ($(words $(BLD)),0)
 override BLD := ./build
 endif
 
 override BLD := ./build
 endif
 

+# When building without <nocheck>, the header is available and thus the test is
+# successful. When building with <nocheck>, the header is missing, but we still
+# pretend it to be available, because configure would fail otherwise.
+export ac_cv_header_gtest_gtest_h=yes
+

 # APT Programs in apt-utils
 APT_UTILS=ftparchive sortpkgs extracttemplates
 
 # APT Programs in apt-utils
 APT_UTILS=ftparchive sortpkgs extracttemplates