From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1kyw-0000NL-RO for guix-patches@gnu.org; Fri, 21 Apr 2017 22:41:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1kys-0000Jy-Rw for guix-patches@gnu.org; Fri, 21 Apr 2017 22:41:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d1kys-0000Jb-OG for guix-patches@gnu.org; Fri, 21 Apr 2017 22:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d1kys-00029T-D4 for guix-patches@gnu.org; Fri, 21 Apr 2017 22:41:02 -0400 Subject: bug#26582: [PATCH] gnu: pcre: Fix Check for Hurd systems. References: <7cNcVrtMKJzzpdMgOTPW3i@Jrt62lb7BFa+Aa7uPD4Kw> Resent-Message-ID: Date: Fri, 21 Apr 2017 21:40:03 -0500 From: rennes In-Reply-To: <874lxilqgu.fsf@gnu.org> (from ludo@gnu.org on Thu Apr 20 16:27:29 2017) Message-Id: <2ExjL3FnTH2ActBCbOgZRN@lTC1VtRxjDOEtGzP2P9M4> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-0keT59+2rB6OpKlCNNk2" 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 26582@debbugs.gnu.org --=-0keT59+2rB6OpKlCNNk2 Content-Type: text/plain; charset=UTF-8; DelSp=Yes; Format=Flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello, On 04/20/2017 04:27:29 PM, Ludovic Court=C3=A8s wrote: > > > > I moved zlib and readline to 'native-inputs'. >=20 > Are you sure they need to be native inputs? Both are libraries, so I > imagine they=E2=80=99re used at run time, not at build time; they should = be > inputs, in this case. >=20 I added system types: "--build=3D" and "--host=3D" to 'configure'. Now =20 detects correctly the inputs. Built successfully on Linux x86_64, GNU/Hurd and cross-compiling with =20 target 'i586-pc-gnu'. Thanks for the guide= --=-0keT59+2rB6OpKlCNNk2 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 05f159e343173708b85c5e45b6cfe64e3939c68d Mon Sep 17 00:00:00 2001 From: rennes Date: Fri, 21 Apr 2017 21:22:08 -0500 Subject: [PATCH] gnu: pcre: Fix Check for Hurd systems. * gnu/packages/pcre.scm (pcre)[arguments]: Add "--disable-stack-for-recursi= on".=09 --- gnu/packages/pcre.scm | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 1946f5229..ca51ff7ec 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) =20 #:use-module (gnu packages readline) #:use-module (gnu packages) #:use-module (guix packages) @@ -54,15 +56,38 @@ ("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 outputs build target #: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) + (string-append "--build=3D" build) + (string-append "--host=3D" (or target build= )) + "--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-= system))) + '("--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 = --=-0keT59+2rB6OpKlCNNk2--