aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-11-13 23:17:15 +0100
committerLudovic Courtès <ludo@gnu.org>2015-11-29 22:59:28 +0100
commitf8e7fdc4165afa8c54638bcc8c40da91bf7c9618 (patch)
treed9bfff0d74ff239ac1ecaf659e29828754a5b4a5 /gnu
parent79c8a071e7f391e40b203f4489396f976a5333a7 (diff)
downloadguix-f8e7fdc4165afa8c54638bcc8c40da91bf7c9618.tar
guix-f8e7fdc4165afa8c54638bcc8c40da91bf7c9618.tar.gz
gnu: tcl: Produce 'tclIndex' files deterministically.
* gnu/packages/patches/tcl-mkindex-deterministic.patch: New patch. * gnu/packages/tcl.scm (tcl)[source]: Use it. * gnu-system.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/patches/tcl-mkindex-deterministic.patch29
-rw-r--r--gnu/packages/tcl.scm16
2 files changed, 37 insertions, 8 deletions
diff --git a/gnu/packages/patches/tcl-mkindex-deterministic.patch b/gnu/packages/patches/tcl-mkindex-deterministic.patch
new file mode 100644
index 0000000000..2fcef6a4f7
--- /dev/null
+++ b/gnu/packages/patches/tcl-mkindex-deterministic.patch
@@ -0,0 +1,29 @@
+This patch ensures that the 'tclIndex' files generated by 'auto_mkindex'
+are sorted in a deterministic fashion.
+
+Fixes a non-determinism issue reported
+at <https://lists.gnu.org/archive/html/guix-devel/2015-10/msg00696.html>.
+
+--- tcl8.6.4/library/auto.tcl 2015-02-26 17:57:28.000000000 +0100
++++ tcl8.6.4/library/auto.tcl 2015-11-13 23:18:34.964831717 +0100
+@@ -207,6 +207,9 @@ proc auto_mkindex {dir args} {
+ set args *.tcl
+ }
+
++ # Keep file names sorted in a determistic order.
++ set args [lsort -ascii $args]
++
+ auto_mkindex_parser::init
+ foreach file [glob -- {*}$args] {
+ try {
+@@ -241,6 +244,10 @@ proc auto_mkindex_old {dir args} {
+ if {![llength $args]} {
+ set args *.tcl
+ }
++
++ # Keep file names sorted in a determistic order.
++ set args [lsort -ascii $args]
++
+ foreach file [glob -- {*}$args] {
+ set f ""
+ set error [catch {
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index c18b8b5112..6f6838c039 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -35,14 +35,14 @@
(package
(name "tcl")
(version "8.6.4")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/tcl/Tcl/"
- version "/tcl" version "-src.tar.gz"))
- (sha256
- (base32
- "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly"))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/tcl/Tcl/"
+ version "/tcl" version "-src.tar.gz"))
+ (sha256
+ (base32
+ "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly"))
+ (patches (list (search-patch "tcl-mkindex-deterministic.patch")))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-before