when applicable, do connection selection outside of send_kx*

[oweals/gnunet.git] / guix-env.scm

diff --git a/guix-env.scm b/guix-env.scm
index 79922b94bcba0b385004c5177754873fd72f490a..23e92a21ffb1193d87711613338ac8fa9ed475e4 100644 (file)
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -104,8 +104,6 @@
 
 (define %source-dir (dirname (current-filename)))
 
-;; This will be needed when gnunet source moves to git.
-;; Taken from https://gitlab.com/dustyweb/pubstrate/blob/master/guix.scm
 (define git-file?
   (let* ((pipe (with-directory-excursion %source-dir
                  (open-pipe* OPEN_READ "git" "ls-files")))
@@ -123,14 +121,14 @@
          (any (cut string-suffix? <> file) files))
         (_ #f)))))
 
-(define gnunet-svn
+(define gnunet-git
   (package
-    (name "gnunet-svn")
+    (name "gnunet-git")
     (version (string-append "0.10.1-" "dev"))
     (source
      (local-file %source-dir
                  #:recursive? #t))
-                 ;;#:select? git-file?))
+                 ;;#:select? git-file?)) ; XXX: FIXME.
     (build-system gnu-build-system)
     (inputs
      `(("glpk" ,glpk)
@@ -168,15 +166,21 @@
        ("automake" ,automake)
        ("gnu-gettext" ,gnu-gettext)
        ("libtool" ,libtool)))
+    ;; TODO:  To make use of out:debug, which carries the symbols,
+    ;; this file needs to fixed.
+    (outputs '("out" "debug"))
     (arguments
      `(#:configure-flags
        (list (string-append "--with-nssdir=" %output "/lib")
-             "--enable-experimental"
              ;; These appear to be "broken" on Guix, needs debugging.
-             ;;"--enable-gcc-hardening"
+             "--enable-gcc-hardening"
              "--enable-linker-hardening"
+
+             "--enable-poisoning"
+             "--enable-sanitizer"
+             "--enable-experimental"
              "--enable-logging=verbose"
-             "--enable-poisoning")
+             "CFLAGS=-ggdb -O0")
        ;;#:parallel-tests? #f ; parallel building seems to fail
        ;;#:tests? #f ; fail: test_gnunet_statistics.py
        #:phases
@@ -192,16 +196,16 @@
          (add-after 'patch-bin-sh 'bootstrap
            (lambda _
              (zero? (system* "sh" "bootstrap"))))
-         (delete 'check)
+         (delete 'check))))
     ;; XXX: https://gnunet.org/bugs/view.php?id=4619
-    (add-after 'install 'set-path-for-check
-      (lambda* (#:key outputs #:allow-other-keys)
-        (let* ((out (assoc-ref outputs "out"))
-               (bin (string-append out "/bin"))
-               (lib (string-append out "/lib")))
-          (setenv "GNUNET_PREFIX" lib)
-          (setenv "PATH" (string-append (getenv "PATH") ":" bin))
-          (zero? (system* "make" "check"))))))))
+    ;; (add-after 'install 'set-path-for-check
+    ;;   (lambda* (#:key outputs #:allow-other-keys)
+    ;;     (let* ((out (assoc-ref outputs "out"))
+    ;;            (bin (string-append out "/bin"))
+    ;;            (lib (string-append out "/lib")))
+    ;;       (setenv "GNUNET_PREFIX" lib)
+    ;;       (setenv "PATH" (string-append (getenv "PATH") ":" bin))
+    ;;       (zero? (system* "make" "check"))))))))
     (synopsis "Secure, decentralized, peer-to-peer networking framework")
     (description
      "GNUnet is a framework for secure peer-to-peer networking.  The
@@ -213,4 +217,4 @@ kinds of basic applications for the foundation of a GNU internet.")
     (license license:gpl3+)
     (home-page "https://gnunet.org/")))
 
-gnunet-svn
+gnunet-git