Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh

[Eric Bavier]

Andreas Enge <address@hidden> writes:

> perl-tk fails on i686 on hydra:
>    http://hydra.gnu.org/build/54474  
> Could you maybe have a look?

The attached patch should fix the issue.

>From a689f8135aeb058ad852e6ede20a11791469df71 Mon Sep 17 00:00:00 2001
From: Eric Bavier <address@hidden>
Date: Mon, 12 May 2014 11:42:53 -0500
Subject: [PATCH] gnu: perl-tk: Patch for i686

* gnu/packages/patches/perl-tk-x11-discover.patch: New patch.
* gnu-system.am [dist_patch_DATA]: Add it.
* gnu/packages/tcl.scm (perl-tk)[origin]: Use it.
---
 gnu-system.am                                   |    1 +
 gnu/packages/patches/perl-tk-x11-discover.patch |   14 ++++++++++++++
 gnu/packages/tcl.scm                            |    4 +++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/perl-tk-x11-discover.patch

diff --git a/gnu-system.am b/gnu-system.am
index fa8f6f7..eb58cc6 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -325,6 +325,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/patchelf-page-size.patch                        \
   gnu/packages/patches/patchutils-xfail-gendiff-tests.patch    \
   gnu/packages/patches/perl-no-sys-dirs.patch                  \
+  gnu/packages/patches/perl-tk-x11-discover.patch              \
   gnu/packages/patches/petsc-fix-threadcomm.patch              \
   gnu/packages/patches/plotutils-libpng-jmpbuf.patch           \
   gnu/packages/patches/procps-make-3.82.patch                  \
diff --git a/gnu/packages/patches/perl-tk-x11-discover.patch 
b/gnu/packages/patches/perl-tk-x11-discover.patch
new file mode 100644
index 0000000..f4365e6
--- /dev/null
+++ b/gnu/packages/patches/perl-tk-x11-discover.patch
@@ -0,0 +1,14 @@
+On non-x86_64 systems, this conditional can cause a specified X11 build value
+to be overwritten to null, causing x11 discovery to fail.
+
+--- a/myConfig 2014-05-12 11:16:48.152719722 -0500
++++ b/myConfig 2014-05-12 11:16:24.704719113 -0500
+@@ -350,7 +350,7 @@
+   #
+   # Prefer 64bit libraries on certain architectures
+   #
+-  unless (defined $xlib and $Config{'archname'} =~ m/x86_64/)
++  unless (defined $xlib or not $Config{'archname'} =~ m/x86_64/)
+     {
+       $xlib64 = &lX11(0, chooseX11(</usr/X11*/lib64>));
+     }
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index eb4c227..4859c2b 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -23,6 +23,7 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
+  #:use-module (gnu packages)
   #:use-module (gnu packages libpng)
   #:use-module (gnu packages libjpeg)
   #:use-module (gnu packages perl)
@@ -177,7 +178,8 @@ X11 GUIs.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "0jarvplhfvnm0shhdm2a5zczlnk9mkf8jvfjiwyhjrr3cy1gl0w0"))))
+               "0jarvplhfvnm0shhdm2a5zczlnk9mkf8jvfjiwyhjrr3cy1gl0w0"))
+             (patches (list (search-patch "perl-tk-x11-discover.patch")))))
     (build-system perl-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("libx11" ,libx11)
-- 
1.7.9.5

-- 
`~Eric