diff options
author | Didier Raboud <odyx@debian.org> | 2019-11-21 10:39:44 +0100 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2019-11-21 10:39:44 +0100 |
commit | 065958aa68cd9bd8f071f8edd969c3bba775e358 (patch) | |
tree | b29734735078bd47772bf4b909ffd609ffadcc9a | |
parent | 0430e393bf80ac6160b6220de99f8b0c2ae1b714 (diff) |
Commit patch queue (exported by git-debrebase)
[git-debrebase make-patches: export and commit patches]
-rw-r--r-- | debian/patches/0001-Use-footer-style-none-in-asciidoc-call.patch | 22 | ||||
-rw-r--r-- | debian/patches/0002-Disable-RPATH-support-in-Debian-builds.patch | 26 | ||||
-rw-r--r-- | debian/patches/series | 2 |
3 files changed, 50 insertions, 0 deletions
diff --git a/debian/patches/0001-Use-footer-style-none-in-asciidoc-call.patch b/debian/patches/0001-Use-footer-style-none-in-asciidoc-call.patch new file mode 100644 index 0000000..25786a4 --- /dev/null +++ b/debian/patches/0001-Use-footer-style-none-in-asciidoc-call.patch @@ -0,0 +1,22 @@ +From: Didier Raboud <odyx@debian.org> +Date: Sun, 27 Aug 2017 17:19:03 +0200 +Subject: Use footer-style=none in asciidoc call + +In the asciidoc call, use the '-a footer-style=none' to export without the footer; as it contains the build timestamp, which makes the build unreproducible +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 67d503c..270d42e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -177,7 +177,7 @@ install-docs: + + Tcl.html: jim_tcl.txt @srcdir@/make-index + @if HAVE_ASCIIDOC +- @tclsh@ @srcdir@/make-index $> $^ | @ASCIIDOC@ -d manpage - | @SED@ -e '/^<div.*id="footer-text"/,/<\/div>/d' >$@ ++ @tclsh@ @srcdir@/make-index $> $^ | @ASCIIDOC@ -d manpage -a footer-style=none - | @SED@ -e '/^<div.*id="footer-text"/,/<\/div>/d' >$@ + @else + @echo "asciidoc is not available"; false + @endif diff --git a/debian/patches/0002-Disable-RPATH-support-in-Debian-builds.patch b/debian/patches/0002-Disable-RPATH-support-in-Debian-builds.patch new file mode 100644 index 0000000..22f8459 --- /dev/null +++ b/debian/patches/0002-Disable-RPATH-support-in-Debian-builds.patch @@ -0,0 +1,26 @@ +From: Didier Raboud <odyx@debian.org> +Date: Thu, 21 Nov 2019 10:37:32 +0100 +Subject: Disable RPATH support in Debian builds + +--- + auto.def | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/auto.def b/auto.def +index fe6e4a2..3a3216b 100644 +--- a/auto.def ++++ b/auto.def +@@ -314,11 +314,8 @@ if {[opt-bool shared with-jim-shared]} { + } + define VERSION [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]] + define LIBSOEXT [format [get-define SH_SOEXTVER] [get-define VERSION]] +-if {[get-define libdir] ni {/lib /usr/lib}} { +- define SH_LINKRPATH_FLAGS [format [get-define SH_LINKRPATH] [get-define libdir]] +-} else { +- define SH_LINKRPATH_FLAGS "" +-} ++# Disable RPATH support in Debian builds ++define SH_LINKRPATH_FLAGS "" + define JIM_INSTALL [opt-bool install-jim] + define JIM_DOCS [opt-bool docs] + define JIM_RANDOMISE_HASH [opt-bool random-hash] diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..b56480f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-Use-footer-style-none-in-asciidoc-call.patch +0002-Disable-RPATH-support-in-Debian-builds.patch |