Debian Bug report logs - #983209
lynx: differences in documentation when built in parallel

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Vagrant Cascadian <vagrant@reproducible-builds.org>

To: submit@bugs.debian.org

Subject: lynx: differences in documentation when built in parallel

Date: Sat, 20 Feb 2021 21:15:44 -0800

[Message part 1 (text/plain, inline)]

Source: lynx
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: randomness
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

The lynx documentation has many differences between two builds:

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

  /usr/share/doc/lynx-common/lynx_help/body.html.gz
  
In one of the builds, there has several occurrences of:

  Support·for·this·setting·was·disabled·at·compile-time.	 


All of the documentation differences disappeared for me when disabling
parallelism in the build (and fixing the usrmerge issue reported in
another bug). The attached patch passes --no-parallel to dh in
debian/rules to accomplish this.

I do not know weather this is actually a more serious issue where
various features are actually disabled between the two builds or only a
documentation difference.


This does not resolve all reproducibility issues (e.g. when /bin/sh
points to bash), but should reduce some of the noise when comparing the
differences.


live well,
  vagrant

[0002-debian-rules-Disable-parallel-build.patch (text/x-diff, inline)]

From 234708e2ab9e8117a059905ba69dd65226c0b1c2 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sun, 21 Feb 2021 04:27:16 +0000
Subject: [PATCH 2/2] debian/rules: Disable parallel build.

This causes wildly different documentation to be generated, at the
very least, and possibly significant differences in the binary itself.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 7e4ca22..ef46a5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,4 +62,4 @@ override_dh_link:
 	dh_link
 
 %:
-	dh $@
+	dh $@ --no-parallel
-- 
2.20.1

[signature.asc (application/pgp-signature, inline)]

Message #10 received at 983209@bugs.debian.org (full text, mbox, reply):

From: Andreas Metzler <ametzler@bebt.de>

To: Vagrant Cascadian <vagrant@reproducible-builds.org>, 983209@bugs.debian.org

Subject: Re: Bug#983209: lynx: differences in documentation when built in parallel

Date: Sat, 27 Feb 2021 19:44:10 +0100

On 2021-02-21 Vagrant Cascadian <vagrant@reproducible-builds.org> wrote:
[...]
> The lynx documentation has many differences between two builds:

>   https://tests.reproducible-builds.org/debian/rb-pkg/bullseye/amd64/diffoscope-results/lynx.html

>   /usr/share/doc/lynx-common/lynx_help/body.html.gz

> In one of the builds, there has several occurrences of:

>   Support·for·this·setting·was·disabled·at·compile-time.	 


> All of the documentation differences disappeared for me when disabling
> parallelism in the build (and fixing the usrmerge issue reported in
> another bug). The attached patch passes --no-parallel to dh in
> debian/rules to accomplish this.

> I do not know weather this is actually a more serious issue where
> various features are actually disabled between the two builds or only a
> documentation difference.
[...]

Hello,

afaict it is just a doc-generation issue, the arch-any package does not
differ.

This part of the toplevel makefile seems to be the problem:

CFG2HTML = alphatoc.html body.html cattoc.html
[...]
$(CFG2HTML) :
	@echo 'Making htmlized lynx.cfg'
	cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i
	@-rm -f $(CFG2HTML)
	sed -n -e '/Config_Type  *Config_Table/,/{0, *0, *0}/ p' $(SRC_DIR)/LYReadCFG.i | \
	sed  -e 's/ *{ *"\([^"]*\)".*/\1/' | \
	perl $(scripts_dir)/cfg2html.pl -ams $(srcdir)/lynx.cfg
	-rm -f $(SRC_DIR)/LYReadCFG.i

With -j > 1 the same rule runs multiple times in parallel and job1,
generating alphatoc.html will remove $(SRC_DIR)/LYReadCFG.i before job2
can read it.

This patch (use a "Grouped Target") fixes the issue for me:
-----------
--- lynx-2.9.0dev.6.orig/makefile.in
+++ lynx-2.9.0dev.6/makefile.in
@@ -338,7 +338,7 @@ LYNX_URL='@HOMEPAGE_URL@release/breakout
 LYNXDOCS_URL='$(LYNX_URL)/docs/'
 LYNXHELP_URL='$(LYNX_URL)/lynx_help/'

-@LYNXCFG_MAKE@$(CFG2HTML) :
+@LYNXCFG_MAKE@$(CFG2HTML) &:
 @LYNXCFG_MAKE@	@echo 'Making htmlized lynx.cfg'
 @LYNXCFG_MAKE@	cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i
 @LYNXCFG_MAKE@	@-rm -f $(CFG2HTML)
-----------

Not sure whether it is upstreamable, since &: is a probably a
GNU-make-ism.

cu Andreas

Message #15 received at 983209@bugs.debian.org (full text, mbox, reply):

From: Andreas Metzler <ametzler@bebt.de>

To: 983209@bugs.debian.org

Cc: Vagrant Cascadian <vagrant@reproducible-builds.org>

Subject: Re: Bug#983209: lynx: differences in documentation when built in parallel

Date: Tue, 2 Mar 2021 11:58:38 +0100

[Message part 1 (text/plain, inline)]

Control: tags -1 fixed-upstream

On 2021-02-27 Andreas Metzler <ametzler@bebt.de> wrote:
> On 2021-02-21 Vagrant Cascadian <vagrant@reproducible-builds.org> wrote:
> [...]
> > The lynx documentation has many differences between two builds:
[...]
> > All of the documentation differences disappeared for me when disabling
> > parallelism in the build (and fixing the usrmerge issue reported in
> > another bug). The attached patch passes --no-parallel to dh in

[...]
> This patch (use a "Grouped Target") fixes the issue for me:
> -----------
> --- lynx-2.9.0dev.6.orig/makefile.in
> +++ lynx-2.9.0dev.6/makefile.in
> @@ -338,7 +338,7 @@ LYNX_URL='@HOMEPAGE_URL@release/breakout
>  LYNXDOCS_URL='$(LYNX_URL)/docs/'
>  LYNXHELP_URL='$(LYNX_URL)/lynx_help/'

> -@LYNXCFG_MAKE@$(CFG2HTML) :
> +@LYNXCFG_MAKE@$(CFG2HTML) &:
[...]
> Not sure whether it is upstreamable, since &: is a probably a
> GNU-make-ism.

Hello,

upstream has fixed this in a BSD-make compatible way
https://github.com/ThomasDickey/lynx-snapshots/commit/f100e91840bc2ef2cecf3d0975b734e53637fa55 (stripped patch attached for reference)

So it will be part of the next upstream release. For Debian I think we
will temporarily use the one-line GNU-make-only fix.

cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'

[40_parallel_build_fix.diff (text/x-diff, attachment)]

Message #22 received at 983209-close@bugs.debian.org (full text, mbox, reply):

From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>

To: 983209-close@bugs.debian.org

Subject: Bug#983209: fixed in lynx 2.9.0dev.6-2

Date: Tue, 02 Mar 2021 12:18:45 +0000

Source: lynx
Source-Version: 2.9.0dev.6-2
Done: Andreas Metzler <ametzler@debian.org>

We believe that the bug you reported is fixed in the latest version of
lynx, 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 983209@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Andreas Metzler <ametzler@debian.org> (supplier of updated lynx 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, 02 Mar 2021 13:02:20 +0100
Source: lynx
Architecture: source
Version: 2.9.0dev.6-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Lynx Packaging Team <pkg-lynx-maint@lists.alioth.debian.org>
Changed-By: Andreas Metzler <ametzler@debian.org>
Closes: 983208 983209
Changes:
 lynx (2.9.0dev.6-2) unstable; urgency=medium
 .
   [ Axel Beckert ]
   * Retroactively mention #961080 in previous debian/changelog entry.
 .
   [ Debian Janitor ]
   * Fix day-of-week for changelog entries 2.8.8dev.2-1, 2.8.6-1.
 .
   [ Andreas Metzler ]
   * Hardcode paths for gzip et al for improved reproducible build with/without
     usrmerge. (Patch by Vagrant Cascadian) Closes: #983208
   * [lintian] Use v4 watchfile standard.
   * Add override for lintian false positive
     debian-changelog-file-is-a-symlink.
   * 40_parallel_build_fix.diff: Use "grouped target" to fix doc breakage on
     parallel build. Closes: #983209
   * Bump Standards-Version to 4.5.1. (No changes)
Checksums-Sha1: 
 fba320366134844af62edac605d0e22c76ff9b3e 2528 lynx_2.9.0dev.6-2.dsc
 e65d633de51fa7415bd80d4f79b64ff046e35f35 29476 lynx_2.9.0dev.6-2.debian.tar.xz
Checksums-Sha256: 
 8a8d439e9e053e2ead6e34dbd30fd17d3e14bc0ec02f228cd1c2bfeffcba8979 2528 lynx_2.9.0dev.6-2.dsc
 207c6504519b6c992c17edbda1c7d586789c07c35b31c5aad31bfe2c6f87a5bb 29476 lynx_2.9.0dev.6-2.debian.tar.xz
Files: 
 e8259d97acf1483f5f0901aa58fe29dd 2528 web optional lynx_2.9.0dev.6-2.dsc
 25d0bfd4775f414b56df446d2949707c 29476 web optional lynx_2.9.0dev.6-2.debian.tar.xz

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

iQIzBAEBCgAdFiEE0uCSA5741Jbt9PpepU8BhUOCFIQFAmA+KlAACgkQpU8BhUOC
FIRHqA/9G63TQZX6c46PI3rqYrh1Z926+ex7GxYm/FfYCTA/m18TMhkXbifstxNE
o6kPwYaz4Y9f6e80QzGdfAboHAFsnaxzL7f8EU5vV9UGA37CaEop/AT3DTMYk334
wjHTUCQw+lgPdRSgIIZmznfXbvBFLrKhpBbr+eO5atTloGqMclAwf7uPOq4Or+WW
Ut0ar+whH/vpU1tRKV6XolchqfMbu0AeYtVmdMl2bKlQH0M1jZFuBzAFF2UQTQnD
S0jP8uz+TzPO2/RqMXuGbIZBsOIBN68hi1i8m0MKncOtKXgTC7wTjsXQ/Uv3Nd5E
YnNGM/QerpLLIVSwXPaRjDngnTssY4weeLn8xwGa52FhrZIWXPAOGne79UKx9drB
A0St3/1V0bU/5W8SqmwD6CLf/NowaYQkpZdZFf4U3Fo5s/oaSAEz1CPHroiyWztQ
FoaScQeGLo+09thOgjDXTl2HFgN7PLEKfumrbzslV/j6iM6iEglJsztdG+oL1xN8
6v41kVOWFDJvtHBFPes3RtpfSuqdstxVLHf1aPtGaI8fMeL3W75OI/icThD0bxeR
JYiurQH1kpFMAGkYfq/y+tvVNhY+ZCbyrfqUhHTlDOj7kubjftQ1C/B+06bP+gkD
zfhMwI7GEsTyeZLwCywcYjUkJRIpO9Ba0UddZXtzbc4yLiZum+Q=
=RvCk
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.