From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#40677] [PATCH 18/18] gnu: pjproject-jami: Add the missing, linux-only "--enable-epoll" flag. Resent-Message-ID: From: Jan Wielkiewicz Date: Tue, 21 Apr 2020 18:10:32 +0200 Message-Id: <20200421161032.1847-18-tona_kosmicznego_smiecia@interia.pl> In-Reply-To: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> References: <20200421161032.1847-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40677@debbugs.gnu.org Cc: Jan Wielkiewicz --- 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 -- 2.26.1