diff mbox series

[bug#40677,18/18] gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag.

Message ID 20200421161032.1847-18-tona_kosmicznego_smiecia@interia.pl
State Accepted
Headers show
Series [bug#40677,01/18] gnu: jami: Move Jami and its dependencies to jami.scm. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Jan Wielkiewicz April 21, 2020, 4:10 p.m. UTC 
---
 gnu/packages/jami.scm | 60 ++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

Comments

Mathieu Othacehe April 22, 2020, 9:44 a.m. UTC | #1 
> -             "--disable-l16-codec"
> -             "--disable-gsm-codec"
> -             "--disable-g722-codec"
> -             "--disable-g7221-codec"
> -             "--disable-speex-codec"

You should fix indentation in a separate commit, otherwise its hard to
see get what's going on here.

> +        ;; The following flag is linux specific
> +        ,@(if (hurd-triplet? (or (%current-system)
> +                                 (%current-target-system)))
> +              '("--enable-epoll")
> +              '())

Don't we want to add this flag only on Linux platform? I think you
should transpose the if branches.

Thanks,

Mathieu
diff mbox series

Patch

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index b441e5e426..a61b1b6043 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -32,6 +32,7 @@ 
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages hurd)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages multiprecision)
@@ -161,33 +162,38 @@ 
        ;; See ring-project/daemon/contrib/src/pjproject/rules.mak.
        #:configure-flags
        (list ;;"--disable-oss" ; do we need this?
-             "--disable-sound"
-             "--disable-video"
-             "--enable-ext-sound"
-             "--disable-speex-aec"
-             "--disable-g711-codec"
-             "--disable-l16-codec"
-             "--disable-gsm-codec"
-             "--disable-g722-codec"
-             "--disable-g7221-codec"
-             "--disable-speex-codec"
-             "--disable-ilbc-codec"
-             "--disable-opencore-amr"
-             "--disable-silk"
-             "--disable-sdl"
-             "--disable-ffmpeg"
-             "--disable-v4l2"
-             "--disable-openh264"
-             "--disable-resample"
-             "--disable-libwebrtc"
-             "--with-gnutls"
-             "--with-external-srtp"
-             ;; We need -fPIC or else we get the following error when linking
-             ;; against pjproject-jami:
-             ;;   relocation R_X86_64_32S against `.rodata' can not be used when
-             ;;   making a shared object;
-             "CFLAGS=-fPIC"
-             "CXXFLAGS=-fPIC")
+        "--disable-sound"
+        "--disable-video"
+        ;; The following flag is linux specific
+        ,@(if (hurd-triplet? (or (%current-system)
+                                 (%current-target-system)))
+              '("--enable-epoll")
+              '())
+        "--enable-ext-sound"
+        "--disable-speex-aec"
+        "--disable-g711-codec"
+        "--disable-l16-codec"
+        "--disable-gsm-codec"
+        "--disable-g722-codec"
+        "--disable-g7221-codec"
+        "--disable-speex-codec"
+        "--disable-ilbc-codec"
+        "--disable-opencore-amr"
+        "--disable-silk"
+        "--disable-sdl"
+        "--disable-ffmpeg"
+        "--disable-v4l2"
+        "--disable-openh264"
+        "--disable-resample"
+        "--disable-libwebrtc"
+        "--with-gnutls"
+        "--with-external-srtp"
+        ;; We need -fPIC or else we get the following error when linking
+        ;; against pjproject-jami:
+        ;;   relocation R_X86_64_32S against `.rodata' can not be used when
+        ;;   making a shared object;
+        "CFLAGS=-fPIC"
+        "CXXFLAGS=-fPIC")
        #:modules ((guix build utils)
                   ,@(@@ (guix build-system gnu) %default-modules))
        #:phases