guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] gnu: curl: Update to 7.41.0. Fix #20121.


From: Tomáš Čech
Subject: Re: [PATCH] gnu: curl: Update to 7.41.0. Fix #20121.
Date: Sun, 22 Mar 2015 13:40:39 +0100
User-agent: Mutt/1.5.23 (2014-03-12)

On Sun, Mar 22, 2015 at 11:20:36AM +0100, Tomáš Čech wrote:
...
   (arguments
-    `(#:configure-flags '("--with-gnutls" "--with-gssapi")
+    `(#:configure-flags
+      '("--with-gnutls" "--with-gssapi" "--enable-http"
+        ;; This option requires parameter so let's use this one
+        ;; - when it exists, it makes sense
+        ;; - when it doesn't exist, we can still use SSL_CERT_DIR environment
+        ;;   variable to set it per user or for whole system
+        ;; Fixes #20121.
+        "--with-ca-path=/etc/ssl/certs"
+        "--enable-ftp" "--enable-proxy" "--with-libidn"
+        "--enable-cookies" "CFLAGS=-ggdb")
+      #:make-flags '("CFLAGS=-ggdb")

Damn, I forgot my debugging code pieces here...
+      #:strip-binaries? #f
      ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
      #:phases
      (alist-replace
@@ -68,12 +83,16 @@
       (lambda _
         (substitute* "tests/runtests.pl"
           (("/bin/sh") (which "sh")))
-
+         ;; Test #1135 requires extern-scan.pl, which is not part of the
+         ;; tarball due to mistake. It was fixed already in upstream. We can
+         ;; simply ignore the test as it aims VMS and OS/400.
+         (delete-file "tests/data/test1135")
         ;; The top-level "make check" does "make -C tests quiet-test", which
         ;; is too quiet.  Use the "test" target instead, which is more
         ;; verbose.
         (zero? (system* "make" "-C" "tests" "test")))
       %standard-phases)))
+   (outputs '("out" "debug"))

...and here.


I removed it from the patch already.

S_W

Attachment: pgpB4duSUp55q.pgp
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]