Bug#809726: apt: please allow building without libgtest-dev under the <nocheck> build profile
Source: apt
Version: 1.1.10
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
Hi Don, Julian and Michael,
Thank you for your continuing support in making this crazy bootstrap
thingy work from the apt side. It now cross builds fine, but I have
still an itch to scratch. 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. So here you
have a patch. Hope you like it.
Helmut
diff --minimal -Nru apt-1.1.10/debian/changelog apt-1.1.10+nmu1/debian/changelog
--- apt-1.1.10/debian/changelog 2015-12-30 00:41:26.000000000 +0100
+++ apt-1.1.10+nmu1/debian/changelog 2016-01-03 14:11:36.000000000 +0100
@@ -1,3 +1,11 @@
+apt (1.1.10+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Allow building without libgtest-dev under the <nocheck> build profile
+ (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sun, 03 Jan 2016 14:11:03 +0100
+
apt (1.1.10) unstable; urgency=medium
[ David Kalnischkies ]
diff --minimal -Nru apt-1.1.10/debian/control apt-1.1.10+nmu1/debian/control
--- apt-1.1.10/debian/control 2015-12-30 00:41:26.000000000 +0100
+++ apt-1.1.10+nmu1/debian/control 2016-01-03 14:08:44.000000000 +0100
@@ -9,7 +9,7 @@
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
diff --minimal -Nru apt-1.1.10/debian/rules apt-1.1.10+nmu1/debian/rules
--- apt-1.1.10/debian/rules 2015-12-30 00:41:26.000000000 +0100
+++ apt-1.1.10+nmu1/debian/rules 2016-01-03 14:10:40.000000000 +0100
@@ -60,6 +60,11 @@
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
Reply to: