all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#26575: [PATCH] gnu: pcre: Fix Check for Hurd systems.
@ 2017-04-20  5:12 rennes
  2017-04-20 14:08 ` Manolis Ragkousis
  0 siblings, 1 reply; 10+ messages in thread
From: rennes @ 2017-04-20  5:12 UTC (permalink / raw)
  To: 26575

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

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  
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?

[-- Attachment #2: 0001-gnu-pcre-Fix-Check-for-Hurd-systems.patch --]
[-- Type: text/x-patch, Size: 3649 bytes --]

From 051df2ff88138039bfe007f724d983ff9172e264 Mon Sep 17 00:00:00 2001
From: rennes <rennes@openmailbox.org>
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-recursion".
---
 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 © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
 ;;;
 ;;; 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=" out)
+                               (string-append "--bindir=" bin)
+                               (string-append "--docdir=" 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-for-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 expression
-- 
2.12.0


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2019-02-13 12:00 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-20  5:12 bug#26575: [PATCH] gnu: pcre: Fix Check for Hurd systems rennes
2017-04-20 14:08 ` Manolis Ragkousis
2017-04-20 19:31   ` bug#26582: " rennes
2017-04-20 21:27     ` Ludovic Courtès
2017-04-21  2:38       ` rennes
2017-04-22  2:40       ` rennes
2017-04-22 22:13         ` Ludovic Courtès
2017-04-29 22:25           ` rennes
2017-05-01 13:34             ` rennes
2019-02-13 11:58     ` Manolis Ragkousis

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.