unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* bug#26930: [PATCH] gnu: search: swish-e: fix compilation errors and check errors.
@ 2017-05-14 17:01 Ethan R. Jones
  2017-09-01 22:59 ` Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: Ethan R. Jones @ 2017-05-14 17:01 UTC (permalink / raw)
  To: 26930; +Cc: Ethan R. Jones

---
 gnu/packages/search.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 8651b985e..b23d57a60 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -235,6 +236,8 @@ conflict with slocate compatibility.")
     ;; swish-e to extend its features at runtime, but are not required for
     ;; building: xpdf, catdoc, MP3::Tag, Spreadsheet::ParseExcel,
     ;; HTML::Entities.
+    ;; FIXME Currently fails compliation with zlib and fails test with
+    ;; libxml2. See bug 25859
     (inputs
      `(("libxml" ,libxml2)
        ("zlib" ,zlib)
@@ -244,7 +247,9 @@ conflict with slocate compatibility.")
        ("perl-html-tagset" ,perl-html-tagset)
        ("perl-mime-types" ,perl-mime-types)))
     (arguments
-     `(#:phases (modify-phases %standard-phases
+     `(#:configure-flags (list (string-append "--without-zlib")
+                               (string-append "--without-libxml2"))
+       #:phases (modify-phases %standard-phases
                   (add-after 'install 'wrap-programs
                     (lambda* (#:key inputs outputs #:allow-other-keys)
                       (let* ((out (assoc-ref outputs "out")))
-- 
2.13.0

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

* bug#26930: [PATCH] gnu: search: swish-e: fix compilation errors and check errors.
  2017-05-14 17:01 bug#26930: [PATCH] gnu: search: swish-e: fix compilation errors and check errors Ethan R. Jones
@ 2017-09-01 22:59 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2017-09-01 22:59 UTC (permalink / raw)
  To: Ethan R. Jones; +Cc: 26930-done

Hi Ethan,

"Ethan R. Jones" <doubleplusgood23@gmail.com> skribis:

> ---
>  gnu/packages/search.scm | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Finally applied:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?id=7bd65a6304b6639554b625db32a1e887deab9158

Thanks, and sorry for the long delay!

Ludo'.

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

end of thread, other threads:[~2017-09-01 23:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-14 17:01 bug#26930: [PATCH] gnu: search: swish-e: fix compilation errors and check errors Ethan R. Jones
2017-09-01 22:59 ` Ludovic Courtès

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).