guix-commits
[Top][All Lists]
Advanced

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

04/07: gnu: pjproject: Include sensible configure flags from pjproject-j


From: guix-commits
Subject: 04/07: gnu: pjproject: Include sensible configure flags from pjproject-jami.
Date: Mon, 3 Aug 2020 23:30:47 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit 3557d7d8bcc5427a5c716cdd65b703812d4d681d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Aug 1 00:06:52 2020 -0400

    gnu: pjproject: Include sensible configure flags from pjproject-jami.
    
    This is done so the regular pjproject has more in common with
    pjproject-jami, which allows simplifying its definition.
    
    * gnu/packages/telephony.scm (pjproject)[configure-flags]: Add
    '--enable-epoll' when the system is Linux.  Define CFLAGS with
    the '-DNDEBUG' options.
---
 gnu/packages/telephony.scm | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index cc31cd6..2c50b34 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -749,17 +749,27 @@ your calls and messages.")
     (arguments
      `(#:tests? #t
        #:test-target "selftest"
-      configure-flags '("--with-external-speex"
-                           "--with-external-gsm"
-                           "--with-external-srtp"
-                           "--with-external-pa"
-                           "--with-gnutls"         ;disable OpenSSL checks
-                           "--disable-libyuv"      ;TODO: add missing package
-                           "--disable-silk"        ;TODO: add missing package
-                           "--disable-libwebrtc"   ;TODO: add missing package
-                           "--disable-ilbc-codec"  ;cannot be unbundled
-                           "--disable-g7221-codec" ;TODO: add missing package
-                           "--enable-libsamplerate")
+       #:configure-flags
+       (list "--with-external-speex"
+             "--with-external-gsm"
+             "--with-external-srtp"
+             "--with-external-pa"
+             ;; The following flag is Linux specific.
+             ,@(if (string-contains (or (%current-system)
+                                        (%current-target-system)) "linux")
+                   '("--enable-epoll")
+                   '())
+             "--with-gnutls"            ;disable OpenSSL checks
+             "--disable-libyuv"         ;TODO: add missing package
+             "--disable-silk"           ;TODO: add missing package
+             "--disable-libwebrtc"      ;TODO: add missing package
+             "--disable-ilbc-codec"     ;cannot be unbundled
+             "--disable-g7221-codec"    ;TODO: add missing package
+             "--enable-libsamplerate"
+             ;; -DNDEBUG is set to prevent pjproject from raising
+             ;; assertions that aren't critical, crashing
+             ;; applications as the result.
+             "CFLAGS=-DNDEBUG")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'make-source-files-writable



reply via email to

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