diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-12-27 18:27:18 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-12-27 18:35:05 +0100 |
| commit | 01a5541948706ae1fed36c5f24b10e2ee4068c5e (patch) | |
| tree | 0ff3d58c2862a96b91610d63e32f1f34f64973bc | |
| parent | f64dba63384f679ebc64ad626b2c497beb13b650 (diff) | |
| download | zsh-01a5541948706ae1fed36c5f24b10e2ee4068c5e.tar.gz zsh-01a5541948706ae1fed36c5f24b10e2ee4068c5e.zip | |
Add patch by Daniel Shahaf to make zsh-dev reproducible (c.f. #849288)
| -rw-r--r-- | debian/patches/remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch b/debian/patches/remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch new file mode 100644 index 000000000..2e955fd4c --- /dev/null +++ b/debian/patches/remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch @@ -0,0 +1,33 @@ +Description: Remove SH_USE_BSD_ECHO autoconf test + It is unused; doesn't make sense in "build on one box, install on many" + context; and its presence causes the downstream packages that install + config.h to be non-reproducible. + . + See https://bugs.debian.org/849288 for a discussion of this issue. +Author: Daniel Shahaf <danielsh@apache.org> +Origin: http://www.zsh.org/mla/workers/2016/msg02716.html + +--- a/configure.ac ++++ b/configure.ac +@@ -2309,21 +2309,6 @@ + if test x$zsh_cv_sys_fifo = xyes; then + AC_DEFINE(HAVE_FIFOS) + fi +-dnl --------------------- +-dnl echo style of /bin/sh +-dnl --------------------- +-AC_CACHE_CHECK(if echo in /bin/sh interprets escape sequences, +-zsh_cv_prog_sh_echo_escape, +-[if test "`/bin/sh -c \"echo '\\n'\"`" = "\\n"; then +- zsh_cv_prog_sh_echo_escape=no +-else +- zsh_cv_prog_sh_echo_escape=yes +-fi]) +-AH_TEMPLATE([SH_USE_BSD_ECHO], +-[Define to 1 if /bin/sh does not interpret \ escape sequences.]) +-if test x$zsh_cv_prog_sh_echo_escape = xno; then +- AC_DEFINE(SH_USE_BSD_ECHO) +-fi + + dnl ----------- + dnl test for whether link() works diff --git a/debian/patches/series b/debian/patches/series index cb6fdacc2..6aec33eff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ further-mitigate-test-suite-hangs.patch update-debian-sections.patch +remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch |