From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh Date: Mon, 12 May 2014 11:46:23 -0500 Message-ID: <87egzz6j34.fsf@gmail.com> References: <87vbup86t1.fsf@gmail.com> <87d2gw7ujh.fsf@gnu.org> <20140508200703.GA25662@debian> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjtKR-0000df-09 for guix-devel@gnu.org; Mon, 12 May 2014 12:43:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjtKI-0007LL-BC for guix-devel@gnu.org; Mon, 12 May 2014 12:43:50 -0400 In-Reply-To: <20140508200703.GA25662@debian> (Andreas Enge's message of "Thu, 8 May 2014 22:07:03 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Andreas Enge Cc: guix-devel@gnu.org --=-=-= Andreas Enge 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. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-perl-tk-Patch-for-i686.patch >From a689f8135aeb058ad852e6ede20a11791469df71 Mon Sep 17 00:00:00 2001 From: Eric Bavier 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()); + } 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 --=-=-=--