Source: vim Version: 2:7.4.488-4 Severity: wishlist Tags: patch upstream User: reproducible-builds@lists.alioth.debian.org Usertags: randomness
Hi! While working on Debian's “reproducible builds” effort [1], we have noticed that vim has produced different documentation files on two successive builds [2]. In one run a generated HTML file didn't contain links to tags, but did so on another run (in an otherwise identical environment). After checking it locally, it turned out to be related to parallel building. The file tags.html (which is not generated from a .txt file) is contained in the HTMLS list, but also its own make target. The attached patch fixes it by removing tags.html from the HTMLS list. The patch has also been forwarded upstream [3]. Regards, Reiner [1]: https://wiki.debian.org/ReproducibleBuilds [2]: https://reproducible.debian.net/rb-pkg/vim.html [3]: https://groups.google.com/forum/#!topic/vim_dev/fp7YNX8LlT8
diff --git a/debian/changelog b/debian/changelog index bf13296..7f9b65c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vim (2:7.4.488-4.0~reproducible1) UNRELEASED; urgency=low + + * Added patch to fix parallel doc building. + + -- Reiner Herrmann <rei...@reiner-h.de> Sat, 17 Jan 2015 12:58:28 +0100 + vim (2:7.4.488-4) unstable; urgency=medium * Move vim icon from vim-gui-common to vim-common since both vim.desktop and diff --git a/debian/patches/series b/debian/patches/series index 75171e8..992e609 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ upstream/debian-runtime-versions.patch debian/vim-tiny.patch debian/disabled-modelines.patch debian/extra-tex-detection.patch +upstream/fix_parallel_doc_building.patch diff --git a/debian/patches/upstream/fix_parallel_doc_building.patch b/debian/patches/upstream/fix_parallel_doc_building.patch new file mode 100644 index 0000000..686d512 --- /dev/null +++ b/debian/patches/upstream/fix_parallel_doc_building.patch @@ -0,0 +1,23 @@ +Description: Fix parallel doc building + The Makefile in runtime/doc/ includes the file tags.html + in the HTMLS list of files generated out of .txt files. + But tags.html is not actually generated from a .txt file, + but has an own target. On parallel building the file would + be regenerated while other files are building at the same + time that depend on it. This is fixed by removing tags.html + from the HTMLS list. +Author: Reiner Herrmann <rei...@reiner-h.de> +Forwarded: https://groups.google.com/forum/#!topic/vim_dev/fp7YNX8LlT8 + +Index: vim-7.4.488/runtime/doc/Makefile +=================================================================== +--- vim-7.4.488.orig/runtime/doc/Makefile ++++ vim-7.4.488/runtime/doc/Makefile +@@ -229,7 +229,6 @@ HTMLS = \ + starting.html \ + syntax.html \ + tabpage.html \ +- tags.html \ + tagsrch.html \ + term.html \ + tips.html \
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
