Source: fish Version: 2.1.2+dfsg1-2 Severity: wishlist Tags: patch User: reproducible-builds@lists.alioth.debian.org Usertags: locale X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org
Hi, While working on the "reproducible builds" effort [1], we have noticed that fish could not be built reproducibly. The attached patch removes locale-specific ordering from the documentation. Once applied, fish can be built reproducibly in our reproducible toolchain. [1]: https://wiki.debian.org/ReproducibleBuilds Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
diff --no-dereference -urNad fish.orig/fish-2.1.2+dfsg1/debian/patches/reproducible-doc-toc fish/fish-2.1.2+dfsg1/debian/patches/reproducible-doc-toc --- fish.orig/fish-2.1.2+dfsg1/debian/patches/reproducible-doc-toc 1970-01-01 01:00:00.000000000 +0100 +++ fish/fish-2.1.2+dfsg1/debian/patches/reproducible-doc-toc 2015-07-07 08:36:41.470030079 +0100 @@ -0,0 +1,20 @@ +--- fish-2.1.2+dfsg1.orig/Makefile.in ++++ fish-2.1.2+dfsg1/Makefile.in +@@ -368,7 +368,7 @@ test: $(PROGRAMS) fish_tests + + doc_src/commands.hdr:$(HELP_SRC) doc_src/commands.hdr.in + -rm command_list.tmp command_list_toc.tmp $@ +- for i in `printf "%s\n" $(HELP_SRC)|sort`; do \ ++ for i in `printf "%s\n" $(HELP_SRC) | LC_ALL=C sort`; do \ + echo "<hr>" >>command_list.tmp; \ + cat $$i >>command_list.tmp; \ + echo >>command_list.tmp; \ +@@ -389,7 +389,7 @@ toc.txt: $(HDR_FILES:index.hdr=index.hdr + # The first sed command captures the page name, followed by the description + # The second sed command captures the command name \1 and the description \2, but only up to a dash + # This is to reduce the size of the TOC in the command listing on the main page +- for i in $(HDR_FILES:index.hdr=index.hdr.in); do\ ++ for i in `echo $(HDR_FILES:index.hdr=index.hdr.in) | xargs -n1 | LC_ALL=C sort`; do\ + NAME=`basename $$i .hdr`; \ + NAME=`basename $$NAME .hdr.in`; \ + sed <$$i >>toc.tmp -n \ diff --no-dereference -urNad fish.orig/fish-2.1.2+dfsg1/debian/patches/series fish/fish-2.1.2+dfsg1/debian/patches/series --- fish.orig/fish-2.1.2+dfsg1/debian/patches/series 2015-07-07 08:22:49.696476371 +0100 +++ fish/fish-2.1.2+dfsg1/debian/patches/series 2015-07-07 08:36:37.385845925 +0100 @@ -1,2 +1,3 @@ use-system-python reproducible-doxyfile +reproducible-doc-toc
_______________________________________________ Reproducible-builds mailing list Reproducible-builds@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
