From patchwork Wed Mar 25 07:36:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1261196 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qBlkNjCD; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48nKfJ49xwz9sR4 for ; Wed, 25 Mar 2020 18:35:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 70C3486DFC; Wed, 25 Mar 2020 07:35:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SSiE6Pb1P1Ei; Wed, 25 Mar 2020 07:35:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7C6A987FC1; Wed, 25 Mar 2020 07:35:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B11F11BF2FA for ; Wed, 25 Mar 2020 07:35:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AA8A686C94 for ; Wed, 25 Mar 2020 07:35:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XSRIB1PyI-wy for ; Wed, 25 Mar 2020 07:35:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0778D86BEC for ; Wed, 25 Mar 2020 07:35:31 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id t7so1500673wrw.12 for ; Wed, 25 Mar 2020 00:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FlPAxCNe+zJkTX/6ZNHn19fRx5NxWJ3zeTLqDM+Ljyk=; b=qBlkNjCDF90CbKjO5N0e5+FVwdnnl8KoorEPfd9xKxx+y3KuTNI5tGKgnXj42VQwRh SJ+tnASnTth3AaWUNeW8mDIuPGtSbKm07T+V1SQLi+7SEnSbKObqzH8/I2lItxWGl7sV TcH1CzHAWnZ3IJ8mk66/VHtH1kIBaLusjrvLgBwga67MhrZ4l+y+gwyjV1EpVvhDUENo QZPXIIv1L4+rxKk2AK9Rm4DAsMEI6cRz2CI+9IqG/ErC72csKSH18K6otTjcA59KH1wj hdsrq1TyVhzTkwkzHXLOAuoWNB/hLkY2UYPdaOztrLorOSIRTxEcVEkAVqT5Ca4LQ/SP EO6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FlPAxCNe+zJkTX/6ZNHn19fRx5NxWJ3zeTLqDM+Ljyk=; b=X2f8G8aDjjltbDOmLPx4pSZigz6Mmd5e4lpqLdvIWQzOQxDDg5eL7rmXdqS1pYNxGN ZydVc6xLLSkRo7Bor7cq2hbaIVirlOtEr1HyfAtHmlKWTlc6A3bXVqreGH8hqjd7vnJr uIVq14oABMDUZilegN2/7qfW9QK8P1+of5dZPlcrLhM3eYbAA/qd5WCd+GDNEjtSml2s MbwFB03SKE4tkp3vHfe9vpcclTkceZ4J/mHLp0oEkpbgo3XpDkXfd7U3RA4LDEQ27VQU XQwSrhFk88H6DWItJxts3BsYSTY+piPUMgdtkeGFjBdOuYVc56oKeCNGcBPRIB6olHiF Hqew== X-Gm-Message-State: ANhLgQ3yiuvBbSCP+0UAT9Jg7/xhiQaR/JstU0pLkCIOG6jhdMEjfqJ9 mR6qzxnONnHJMJzYg1Ba25syi7Uz X-Google-Smtp-Source: ADFU+vvR4l+t/btUejJkjaMnurTK4VzUOcUFfIFrkqeVyXl9Q4keKvKxQWY+MXYeEqPGdBYqU7lMSg== X-Received: by 2002:adf:c651:: with SMTP id u17mr2013878wrg.40.1585121728936; Wed, 25 Mar 2020 00:35:28 -0700 (PDT) Received: from kali.home (lfbn-ren-1-403-35.w2-10.abo.wanadoo.fr. [2.10.23.35]) by smtp.gmail.com with ESMTPSA id b82sm7801634wmb.46.2020.03.25.00.35.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 00:35:27 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 25 Mar 2020 08:36:48 +0100 Message-Id: <20200325073648.46890-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 1/1] package/libeXosip2: fix build without threads X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gilles Talis , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/ec262058cc0a4bf92c381857eaf3b44412942bba Signed-off-by: Fabrice Fontaine Reviewed-by: Gilles Talis --- Changes v1 -> v2 (after review of Gilles Talis) - Use upstream patch ...pilation-error-introduced-with-epoll.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch diff --git a/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch b/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch new file mode 100644 index 0000000000..b69455bd7a --- /dev/null +++ b/package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch @@ -0,0 +1,44 @@ +From 0e0e95dbc380c5eede3a2fc1631294a98078e30f Mon Sep 17 00:00:00 2001 +From: Aymeric Moizard +Date: Fri, 13 Mar 2020 16:34:41 +0100 +Subject: fix: fix OSIP_MONOTHREAD compilation error introduced with epoll + implementation + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +http://git.savannah.nongnu.org/cgit/exosip.git/patch/?id=0e0e95dbc380c5eede3a2fc1631294a98078e30f] +--- + src/eXconf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/eXconf.c b/src/eXconf.c +index baf90be..6165eb3 100644 +--- a/src/eXconf.c ++++ b/src/eXconf.c +@@ -801,12 +801,15 @@ eXosip_init (struct eXosip_t *excontext) + } + + if (excontext->poll_method == EXOSIP_USE_EPOLL_LT) { ++#ifndef OSIP_MONOTHREAD + struct epoll_event ev; ++#endif + excontext->epfdctl = epoll_create (1); + if (excontext->epfdctl < 0) { + return OSIP_UNDEFINED_ERROR; + } + ++#ifndef OSIP_MONOTHREAD + memset(&ev, 0, sizeof(struct epoll_event)); + ev.events = EPOLLIN; + ev.data.fd = jpipe_get_read_descr (excontext->j_socketctl_event); +@@ -815,6 +818,7 @@ eXosip_init (struct eXosip_t *excontext) + _eXosip_closesocket (excontext->epfdctl); + return OSIP_UNDEFINED_ERROR; + } ++#endif + } + #endif + +-- +cgit v1.2.1 +