From: Eric Bavier <ericbavier@gmail.com>
To: Andreas Enge <andreas@enge.fr>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh
Date: Mon, 12 May 2014 11:46:23 -0500 [thread overview]
Message-ID: <87egzz6j34.fsf@gmail.com> (raw)
In-Reply-To: <20140508200703.GA25662@debian> (Andreas Enge's message of "Thu, 8 May 2014 22:07:03 +0200")
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
Andreas Enge <andreas@enge.fr> 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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-perl-tk-Patch-for-i686.patch --]
[-- Type: text/x-diff, Size: 2877 bytes --]
From a689f8135aeb058ad852e6ede20a11791469df71 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
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
[-- Attachment #3: Type: text/plain, Size: 12 bytes --]
--
`~Eric
next prev parent reply other threads:[~2014-05-12 16:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-04 15:15 [PATCH] gnu: Add perl-tk, perl-x11-protocol, and clusterssh Eric Bavier
2014-04-04 15:25 ` Sree Harsha Totakura
2014-04-04 15:49 ` Eric Bavier
2014-04-04 19:38 ` Ludovic Courtès
2014-04-04 15:47 ` Mark H Weaver
2014-04-04 19:39 ` Ludovic Courtès
2014-04-04 19:40 ` Ludovic Courtès
2014-05-08 20:07 ` Andreas Enge
2014-05-12 16:46 ` Eric Bavier [this message]
2014-05-12 19:24 ` Ludovic Courtès
2014-05-12 19:26 ` Andreas Enge
2014-05-12 20:40 ` Eric Bavier
2014-05-12 20:53 ` Andreas Enge
2014-05-12 20:41 ` Eric Bavier
2014-05-12 21:51 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87egzz6j34.fsf@gmail.com \
--to=ericbavier@gmail.com \
--cc=andreas@enge.fr \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).