unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: 29392@debbugs.gnu.org
Subject: [bug#29392] [PATCH 05/11] gnu: serf: Use scons-build-system.
Date: Tue, 28 Nov 2017 22:36:45 +0530	[thread overview]
Message-ID: <20171128170651.6136-6-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20171128170651.6136-1-arunisaac@systemreboot.net>

* gnu/packages/web.scm (serf): Switch to scons-build-system.
---
 gnu/packages/web.scm | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b84bbdddd..497bb90ee 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -56,6 +56,7 @@
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system python)
   #:use-module (guix build-system ant)
+  #:use-module (guix build-system scons)
   #:use-module (gnu packages)
   #:use-module (gnu packages apr)
   #:use-module (gnu packages check)
@@ -1068,10 +1069,7 @@ from streaming URLs.  It is a command-line wrapper for the libquvi library.")
                            version ".tar.bz2"))
        (sha256
         (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("scons" ,scons)
-       ("python" ,python-2)))
+    (build-system scons-build-system)
     (propagated-inputs
      `(("apr" ,apr)
        ("apr-util" ,apr-util)
@@ -1081,13 +1079,15 @@ from streaming URLs.  It is a command-line wrapper for the libquvi library.")
        ;;("gss" ,gss)
        ("zlib" ,zlib)))
     (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (srfi srfi-1))
+     `(#:scons ,scons-python2
+       #:scons-flags (list (string-append "APR=" (assoc-ref %build-inputs "apr"))
+                           (string-append "APU=" (assoc-ref %build-inputs "apr-util"))
+                           (string-append "OPENSSL=" (assoc-ref %build-inputs "openssl"))
+                           ;; (string-append "GSSAPI=" (assoc-ref %build-inputs "gss"))
+                           (string-append "ZLIB=" (assoc-ref %build-inputs "zlib"))
+                           (string-append "PREFIX=" %output))
        #:phases
-       ;; TODO: Add scons-build-system and use it here.
        (modify-phases %standard-phases
-         (delete 'configure)
          (add-after 'unpack 'scons-propagate-environment
                     (lambda _
                       ;; By design, SCons does not, by default, propagate
@@ -1098,21 +1098,6 @@ from streaming URLs.  It is a command-line wrapper for the libquvi library.")
                       (substitute* "SConstruct"
                         (("^env = Environment\\(")
                          "env = Environment(ENV=os.environ, "))))
-         (replace 'build
-                  (lambda* (#:key inputs outputs #:allow-other-keys)
-                    (let ((out      (assoc-ref outputs "out"))
-                          (apr      (assoc-ref inputs "apr"))
-                          (apr-util (assoc-ref inputs "apr-util"))
-                          (openssl  (assoc-ref inputs "openssl"))
-                          ;;(gss      (assoc-ref inputs "gss"))
-                          (zlib     (assoc-ref inputs "zlib")))
-                      (zero? (system* "scons"
-                                      (string-append "APR=" apr)
-                                      (string-append "APU=" apr-util)
-                                      (string-append "OPENSSL=" openssl)
-                                      ;;(string-append "GSSAPI=" gss)
-                                      (string-append "ZLIB=" zlib)
-                                      (string-append "PREFIX=" out))))))
          (add-before 'check 'disable-broken-tests
            (lambda _
              ;; These tests rely on SSL certificates that expired 2017-04-18.
@@ -1139,9 +1124,7 @@ from streaming URLs.  It is a command-line wrapper for the libquvi library.")
                   (substitute* "test/test_context.c"
                     (((string-append "SUITE_ADD_TEST\\(suite, " test "\\);")) "")))
                 broken-tests)
-               #t)))
-         (replace 'check   (lambda _ (zero? (system* "scons" "check"))))
-         (replace 'install (lambda _ (zero? (system* "scons" "install")))))))
+               #t))))))
     (home-page "https://serf.apache.org/")
     (synopsis "High-performance asynchronous HTTP client library")
     (description
-- 
2.15.0

  parent reply	other threads:[~2017-11-28 17:08 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-22  8:41 [bug#29392] [PATCH 00/11] New scons build system Arun Isaac
2017-11-22  9:34 ` [bug#29392] [PATCH 01/11] gnu: scons: Update to 3.0.1 Arun Isaac
2017-11-22  9:34   ` [bug#29392] [PATCH 02/11] build-system: Add scons-build-system Arun Isaac
2017-11-26 21:04     ` Leo Famulari
2017-11-22  9:34   ` [bug#29392] [PATCH 03/11] gnu: linuxdcpp: Use scons-build-system Arun Isaac
2017-11-22  9:35   ` [bug#29392] [PATCH 04/11] gnu: gpick: " Arun Isaac
2017-11-22  9:35   ` [bug#29392] [PATCH 05/11] gnu: serf: " Arun Isaac
2017-11-22  9:35   ` [bug#29392] [PATCH 06/11] gnu: metabat: " Arun Isaac
2017-11-22  9:35   ` [bug#29392] [PATCH 07/11] gnu: godot: " Arun Isaac
2017-11-22  9:35   ` [bug#29392] [PATCH 08/11] gnu: pingus: " Arun Isaac
2017-11-22  9:35   ` [bug#29392] [PATCH 09/11] gnu: klick: " Arun Isaac
2017-11-22  9:35   ` [bug#29392] [PATCH 10/11] gnu: mongodb: " Arun Isaac
2017-11-22  9:35   ` [bug#29392] [PATCH 11/11] gnu: pingus: Use HTTPS for home page Arun Isaac
2017-11-25 16:04 ` [bug#29392] [PATCH 00/11] New scons build system Leo Famulari
2017-11-25 16:05 ` Leo Famulari
2017-11-26 11:17   ` Arun Isaac
2017-11-26  1:26 ` Leo Famulari
2017-11-26 16:17   ` Ludovic Courtès
2017-11-26 18:51     ` Leo Famulari
2017-11-28 17:06 ` [bug#29392] [PATCH 00/11] Add " Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 01/11] gnu: scons: Update to 3.0.1 Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 02/11] build-system: Add scons-build-system Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 03/11] gnu: linuxdcpp: Use scons-build-system Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 04/11] gnu: gpick: " Arun Isaac
2017-11-28 17:06   ` Arun Isaac [this message]
2017-11-28 17:06   ` [bug#29392] [PATCH 06/11] gnu: metabat: " Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 07/11] gnu: godot: " Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 08/11] gnu: pingus: " Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 09/11] gnu: klick: " Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 10/11] gnu: mongodb: " Arun Isaac
2017-11-28 17:06   ` [bug#29392] [PATCH 11/11] gnu: pingus: Use HTTPS for home page Arun Isaac
2017-11-28 21:38   ` [bug#29392] [PATCH 00/11] Add scons build system Leo Famulari
2017-11-29  8:19     ` Arun Isaac
2017-11-29 21:29       ` Leo Famulari
2017-11-30 13:40         ` bug#29392: " Arun Isaac
2017-11-30 17:05           ` [bug#29392] " Ludovic Courtès

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=20171128170651.6136-6-arunisaac@systemreboot.net \
    --to=arunisaac@systemreboot.net \
    --cc=29392@debbugs.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).