From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d14Ov-0006SR-4k for guix-patches@gnu.org; Thu, 20 Apr 2017 01:13:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d14Os-0002iB-09 for guix-patches@gnu.org; Thu, 20 Apr 2017 01:13:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59615) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d14Or-0002i6-TH for guix-patches@gnu.org; Thu, 20 Apr 2017 01:13:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d14Or-0003R9-O0 for guix-patches@gnu.org; Thu, 20 Apr 2017 01:13:01 -0400 Subject: bug#26575: [PATCH] gnu: pcre: Fix Check for Hurd systems. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d14OH-0006NQ-UT for guix-patches@gnu.org; Thu, 20 Apr 2017 01:12:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d14OE-0002cK-Or for guix-patches@gnu.org; Thu, 20 Apr 2017 01:12:25 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:52422 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d14OE-0002c6-B1 for guix-patches@gnu.org; Thu, 20 Apr 2017 01:12:22 -0400 Date: Thu, 20 Apr 2017 00:12:13 -0500 From: rennes Message-Id: <5KS7z5mphS+XEqq1mDxH00@zOZmN4tlatuvZLJiZIxdE> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-yCOYXEPId47MFgzZPpL2" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26575@debbugs.gnu.org --=-yCOYXEPId47MFgzZPpL2 Content-Type: text/plain; charset=us-ascii; DelSp=Yes; Format=Flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello, This patch fix the Check phase on GNU/Hurd. Built in Linux and Hurd. Additional, I have a doubt regarding the outputs of the package, after =20 build shows: /gnu/store/9bx00n7mpxiyp9nyjz5qas53kc3wid5i-pcre-8.40-bin /gnu/store/qb2mbv1wj3b18ix88blfidyy0yzrzggz-pcre-8.40-doc /gnu/store/v8ma5z2d1m78f64c9m3dp6s3359w02h0-pcre-8.40 The outputs have different hash, is this correct?= --=-yCOYXEPId47MFgzZPpL2 Content-Type: text/x-patch; charset=UTF-8; name=0001-gnu-pcre-Fix-Check-for-Hurd-systems.patch Content-Disposition: attachment; filename=0001-gnu-pcre-Fix-Check-for-Hurd-systems.patch Content-Transfer-Encoding: quoted-printable =46rom 051df2ff88138039bfe007f724d983ff9172e264 Mon Sep 17 00:00:00 2001 From: rennes Date: Thu, 20 Apr 2017 00:05:35 -0500 Subject: [PATCH] gnu: pcre: Fix Check for Hurd systems. * gnu/packages/pcre.scm (pcre)[arguments]: Add "--disable-stack-for-recursi= on". --- gnu/packages/pcre.scm | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 1946f5229..c92267a90 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -5,6 +5,7 @@ ;;; Copyright =C2=A9 2016 Leo Famulari ;;; Copyright =C2=A9 2017 Marius Bakke ;;; Copyright =C2=A9 2017 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2017 Rene Saavedra ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages pcre) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages compression) + #:use-module (gnu packages hurd) #:use-module (gnu packages readline) #:use-module (gnu packages) #:use-module (guix packages) @@ -54,15 +56,36 @@ ("readline" ,readline) ("zlib" ,zlib))) (arguments - '(#:disallowed-references ("doc") - #:configure-flags '("--enable-utf" - "--enable-pcregrep-libz" - "--enable-pcregrep-libbz2" - "--enable-pcretest-libreadline" - "--enable-unicode-properties" - "--enable-pcre16" - "--enable-pcre32" - "--enable-jit"))) + `(#:disallowed-references ("doc") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin")) + (doc (assoc-ref outputs "doc"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* "./configure" + (string-append "--prefix=3D" out) + (string-append "--bindir=3D" bin) + (string-append "--docdir=3D" doc) + "--enable-utf" + "--enable-pcregrep-libz" + "--enable-pcregrep-libbz2" + "--enable-pcretest-libreadline" + "--enable-unicode-properties" + "--enable-pcre16" + "--enable-pcre32" + "--enable-jit" + ;; On GNU/Hurd systems FAIL 'RunTest' with = 'segmentation + ;; fault' in Check phase, to pass the test = we can disable + ;; "--enable-jit" or set "--disable-stack-f= or-recursion" + ;; argument. + ,@(if (hurd-triplet? ((or %current-system + %current-target-s= ystem))) + '("--disable-stack-for-recursion") + '()))))))))) (synopsis "Perl Compatible Regular Expressions") (description "The PCRE library is a set of functions that implement regular express= ion --=20 2.12.0 = --=-yCOYXEPId47MFgzZPpL2--