From patchwork Tue Apr 21 16:10:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 21396 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3CFC027BBE4; Tue, 21 Apr 2020 17:12:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 082D127BBE1 for ; Tue, 21 Apr 2020 17:12:59 +0100 (BST) Received: from localhost ([::1]:60890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvW6-0004lF-JM for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 12:12:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52342) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQvVM-0003SR-5d for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQvVK-00047v-W9 for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQvVK-00047e-JL for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQvVK-00062Q-EI for guix-patches@gnu.org; Tue, 21 Apr 2020 12:12:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40677] [PATCH 18/18] gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Apr 2020 16:12:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 40677-submit@debbugs.gnu.org id=B40677.158748551623071 (code B ref 40677); Tue, 21 Apr 2020 16:12:10 +0000 Received: (at 40677) by debbugs.gnu.org; 21 Apr 2020 16:11:56 +0000 Received: from localhost ([127.0.0.1]:50614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvV5-0005zy-Tw for submit@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:56 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.158]:40382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQvUZ-0005vz-Fu for 40677@debbugs.gnu.org; Tue, 21 Apr 2020 12:11:24 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.193 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-193.dynamic.chello.pl [89.64.43.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Tue, 21 Apr 2020 18:11:17 +0200 (CEST) From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:32 +0200 Message-Id: <20200421161032.1847-18-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1587485478; bh=0l3KDGfWlGneWe3W5TgPS9ApoZHkAJxVz1huxoRZ980=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=qeoFwOQYC13EkddtzzZ7kFHhQo0BHtE5w6r2zo0Gnd07bVzIsRLqJ7CCkt8bmtHRi jSq3Le/jTWW9jaO9o1mOGzgSrpd/ZVSI32gAiNtlETfsztsh9RUfrDk4+seovHdekH 1XgqNLrgMbXqwuCBPE6hV7Ox32IzvAacikzfL3pI= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/jami.scm | 60 ++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) 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