[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1009797: marked as done (apt: support "nodoc" build profile)

Your message dated Wed, 18 May 2022 08:22:18 +0000
with message-id <E1nrEwk-0000KX-UO@fasolo.debian.org>
and subject line Bug#1009797: fixed in apt 2.5.0
has caused the Debian Bug report #1009797,
regarding apt: support "nodoc" build profile
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1009797: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009797
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: apt
Severity: wishlist
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: randomness
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

There are some non-deterministic identifiers that doxygen introduces
into apt's documentation packages:

  https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/apt.html

The attached patch, adds support for the "nodoc" build profile, allowing
to build the other apt packages reproducibly by excluding the
documentation packages.

This also allows building functional apt packages with a smaller
dependency chain, so might help with bootstrapping efforts too!

I thought docbook* and xsltproc could also be excluded from the
Build-Depends, but that triggered some other build failures.


Of course, ideally building documentation reproducibly would be very
nice as well, so it would be good to eventually fix the underlying
issues in doxygen:

  https://tests.reproducible-builds.org/debian/issues/unstable/nondeterminstic_todo_identifiers_in_documentation_generated_by_doxygen_issue.html
  https://tests.reproducible-builds.org/debian/issues/unstable/nondeterministic_ordering_in_documentation_generated_by_doxygen_issue.html


Thanks for maintaining apt!


live well,
  vagrant

From d408a3b439dafa4378a1eec6c7c4dbefe4986897 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sun, 17 Apr 2022 22:11:12 +0000
Subject: [PATCH 2/2] Add support for "nodoc" build profile.

  https://wiki.debian.org/BuildProfileSpec#Registered_profile_names
---
 debian/control | 4 +++-
 debian/rules   | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 2f1d0515e..7f10eec3e 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends: cmake (>= 3.4),
                triehash,
                xsltproc,
                zlib1g-dev
-Build-Depends-Indep: doxygen, graphviz, w3m
+Build-Depends-Indep: doxygen <!nodoc>, graphviz <!nodoc>, w3m <!nodoc>
 Vcs-Git: https://salsa.debian.org/apt-team/apt.git
 Vcs-Browser: https://salsa.debian.org/apt-team/apt
 
@@ -101,6 +101,7 @@ Priority: optional
 Depends: ${misc:Depends}
 Section: doc
 Multi-Arch: foreign
+Build-Profiles: <!nodoc>
 Description: documentation for APT
  This package contains the user guide and offline guide for various
  APT tools which are provided in a html and a text-only version.
@@ -125,6 +126,7 @@ Priority: optional
 Depends: ${misc:Depends}
 Section: doc
 Multi-Arch: foreign
+Build-Profiles: <!nodoc>
 Description: documentation for APT development
  This package contains documentation for development of the APT
  Debian package manipulation program and its libraries.
diff --git a/debian/rules b/debian/rules
index ce9218968..38db7819a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,12 @@ else
 	configure_test_flags =
 endif
 
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+	WITH_DOC=-DWITH_DOC=ON
+else
+	WITH_DOC=-DWITH_DOC=OFF
+endif
+
 %:
 	dh $@ --buildsystem=cmake+ninja
 
@@ -45,6 +51,6 @@ override_dh_installsystemd:
 	dh_installsystemd --remaining-packages
 
 override_dh_auto_configure-arch: flags=-DWITH_DOC=OFF
-override_dh_auto_configure-indep: flags=-DWITH_DOC=ON
+override_dh_auto_configure-indep: flags=$(WITH_DOC)
 override_dh_auto_configure-arch override_dh_auto_configure-indep:
 	dh_auto_configure -- $(flags) $(configure_test_flags)
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: apt
Source-Version: 2.5.0
Done: Julian Andres Klode <jak@debian.org>

We believe that the bug you reported is fixed in the latest version of
apt, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1009797@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julian Andres Klode <jak@debian.org> (supplier of updated apt package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Tue, 17 May 2022 18:50:45 +0200
Source: apt
Built-For-Profiles: noudeb
Architecture: source
Version: 2.5.0
Distribution: unstable
Urgency: medium
Maintainer: APT Development Team <deity@lists.debian.org>
Changed-By: Julian Andres Klode <jak@debian.org>
Closes: 1008036 1009796 1009797 1010029 1010030
Changes:
 apt (2.5.0) unstable; urgency=medium
 .
   [ Helmut Grohne ]
   * Avoid use of deprecated std::iterator (twice) (Closes: #1008036)
 .
   [ David Kalnischkies ]
   * Document tagfile-keys.h as internal to apt
   * Drop support for long obsoleted Suggests alias: Optional
   * Do not order long obsoleted fields anymore
   * Stop parsing undocumented unknown EDSP field APT-Hash
   * Avoid .c_str() on strings feed into pkgTagSection::FindS
   * Use pkgTagSection::Key in more places in src:apt
   * Parse Checksum fields via pkgTagSection::Key, too
   * Avoid building all docs in nodoc build profile
   * Add pkg.apt.nodoxygen build profile
   * Use build-dep & satisfy for our CI dependency resolution
   * Mark pkg-config-test autopkgtest as superficial
   * Avoid building inside the source dir in autopkgtest
   * Link interactive helpers against system libapt for autopkgtest
   * Remove unused public zlib include from libapt fileutl.h
   * Run ./prepare-release post-build checks in Gitlab CI
   * Do not build documentation twice in CI
   * Ignore stty failures in testcases
   * Include our config.h in all C++ files to avoid ODR violations
   * Ship our README.md in apt package
 .
   [ Frans Spiesschaert ]
   * Dutch program translation update (Closes: #1010029)
   * Dutch manpages translation update (Closes: #1010030)
 .
   [ Troy Varney ]
   * Fix mirror method dequeuing incorrect items
 .
   [ Julian Andres Klode ]
   * Do not accept arguments for apt-cache dotty, xvcg.
     These commands do not actually interpret the same
     arguments as depends, or any own ones for that matter.
   * tests: Add g++ dependency to pkg-config test
 .
   [ Vagrant Cascadian ]
   * Pass -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON via dh_auto_configure override
     (Closes: #1009796)
   * Add support for "nodoc" build profile (Closes: #1009797)
Checksums-Sha1:
 5c18d9d73517671760d3a3b4e6d6e87ad6a0da11 2933 apt_2.5.0.dsc
 88e92d17df9b3681f711d6337d68ebfef47bb344 2218792 apt_2.5.0.tar.xz
 673970e1da89025782a9a78db2a6bee5c0bfd071 10283 apt_2.5.0_source.buildinfo
Checksums-Sha256:
 2546e510fc11d17b29bc63dc0460ac58b3af2b12e953350468ab9644be653640 2933 apt_2.5.0.dsc
 61cd84d04e2a7858f70dca21160977479c74150853cdeef7c843d59e72488c1f 2218792 apt_2.5.0.tar.xz
 b2cee4c52ca4699aff3bb7fc43c317a47728ca7c2f5ec930e2af9929659008ed 10283 apt_2.5.0_source.buildinfo
Files:
 b2699c1572cf5bd85265d9f0ccc60cb2 2933 admin important apt_2.5.0.dsc
 4d0beed7d4732145269ab64fd6eaa811 2218792 admin important apt_2.5.0.tar.xz
 4b23e76db907741633655f0d2a27d826 10283 admin important apt_2.5.0_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJDBAEBCgAtFiEET7WIqEwt3nmnTHeHb6RY3R2wP3EFAmKEo8APHGpha0BkZWJp
YW4ub3JnAAoJEG+kWN0dsD9xnMoQAItMDCJQ8j5pKzqH9xcgB0117mDE1G4Zrhoq
EBWHQZJa3ITyCWYBGAekcUIXVjvtV2nxWeTlkVz7HoT3D/Cft8yfxGZkeo7+rnTE
4gC6VTJZeZ9zG07km1H4/OwHv8aYQEJZWBCbtkuduUijOJCPac7SCVbHtvFaWdXx
9KcuIg+i6WEq4b3MRCwJ/UCruj6D37KcvPUkFNP29mz34sawsPCNFqk2e67ab4Uv
3sySJzD6rP5EriWVPruno4bAriOdCDsmVpOvYXP+jOVCXips7/R67/SYVKAh/EAb
gESIevQ8+M5yUt827Jw7SEqOvB6Ca1BGMH3yZ8QF2XsHLUYWYft/zx6SRef/CVOM
tbpKfZrw9589u9b+YuzLa2Bf1p6iCX9AEmpsdiXwJQ1Zax8U7gGcepAOQ9KmDvaD
2LhSMZGBguz9W0wUUMt9KLEOipuihY8phsurVhDmxrHNIgRKXXUMEFkTyMJ47DOw
xgbry97BsjYaTNPT3++BVCuAPOzjAlQ/0WhNk9UTxb7ubIxOt1WL8r5mNr+HuZjO
I13azE6ZgJqT0eC/cvLboP14e+or3RfKwzBBPWHSaoohoZvcoFeTL+v+whCogWBW
mzUHilnD1yQ3HiF1aVJ3LFnfYTfDRUxo/FxyNeldaPCWtTNQ3ftFC2RIbhjiY2BO
4qWFMAvt
=rUGa
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: