unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Sree Harsha Totakura <sreeharsha@totakura.in>
To: guix-devel@gnu.org
Subject: [PATCH 2/2] gnu: curl: Fix tests.
Date: Tue, 18 Feb 2014 21:45:58 +0100	[thread overview]
Message-ID: <1392756358-15898-3-git-send-email-sreeharsha@totakura.in> (raw)
In-Reply-To: <1392756358-15898-1-git-send-email-sreeharsha@totakura.in>

* gnu/packages/curl.scm (curl): Add a new phase and python-2 to native-inputs.
---
 gnu/packages/curl.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index ea7dbf6..747535d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages ssh))
 
 (define-public curl
@@ -59,9 +60,20 @@
      `(("perl" ,perl)
        ;; to enable the --manual option and make test 1026 pass
        ("groff" ,groff)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-2)))
    (arguments
-    `(#:configure-flags '("--with-gnutls" "--with-gssapi")))
+    `(#:configure-flags '("--with-gnutls" "--with-gssapi")
+      ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
+      #:phases
+      (alist-cons-before
+       'check 'patch-runtests
+       (lambda _
+         (with-directory-excursion "tests"
+           (substitute* "runtests.pl"
+             (("/bin/sh")
+              (which "sh")))))
+       %standard-phases)))
    (synopsis "curl, command line tool for transferring data with URL syntax")
    (description
     "curl is a command line tool for transferring data with URL syntax,
-- 
1.8.5.3

  parent reply	other threads:[~2014-02-18 20:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-18 20:45 [PATCH 0/2] Update cURL to 7.35.0 and fix its tests Sree Harsha Totakura
2014-02-18 20:45 ` [PATCH 1/2] gnu: curl: Update to 7.35.0 Sree Harsha Totakura
2014-02-18 20:45 ` Sree Harsha Totakura [this message]
2014-02-18 22:39 ` [PATCH 0/2] Update cURL to 7.35.0 and fix its tests Andreas Enge
2014-02-18 23:14   ` Sree Harsha Totakura

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=1392756358-15898-3-git-send-email-sreeharsha@totakura.in \
    --to=sreeharsha@totakura.in \
    --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).