From patchwork Fri Jul 21 11:16:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108468 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp507032obm; Fri, 21 Jul 2017 04:16:15 -0700 (PDT) X-Received: by 10.98.63.204 with SMTP id z73mr7010668pfj.278.1500635775553; Fri, 21 Jul 2017 04:16:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500635775; cv=none; d=google.com; s=arc-20160816; b=WgMr9S9fekC3IAZmP0KCqBcr4wbJQ/xIyBAc+GIiDW3dntguexb4Adg/tDi50DqUhT PSDSDA/3BGBs/fB7oeogT8OEQxA15N9/dd2f6Gpgmcpz/3Ljj/a3mdmTZ2UWFC7IV1pu v8WM7xagZV/+/O+LL4xBgLgtmX9fXi+Pr/PiNKqHlYwpYPvGqnJGE4+5xrgOnIR1DBJY CVXhnC8X5Af4t5Ky7Pzexpu2DsBAq8xUTFX9QYla2ApULEWc0RKc5l6Gq7ETd9W7XuJW hg2bs1G0iOgUx8pi20MmlJYTHzcifySdTqsiyeIWuSBFr+IYj4t+zxViQi4mSBmAnyCJ iReg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=DL+BDqLIWQ6gQYdhbsvJBuHiq2NFCQ4oiELUECvFxXg=; b=DaOtoMsLrruUj1YXJhtpxLa2MmMZNx++swnJeoTs7GggZ99j3FOOIIlMp2PDt3dacA ZvbWh7kU6IRDfcfG7tQyHcHndXnZRd/bMCB/TINWeYx6Fz/cBCwPlDIM3rlXq2lL7TjU B5bnAPKqkHAXKe4QWwSfmSY3p6kvOyYSpKnU9i9E3DmYYg5gNDvWv1Y1fXIqI8wrlg3N rEYEmFJKI95Ltkv4BC239srdhC4/f28tGlWPg7R1bEc2uOKY7URqInFFm33OvEj9E3HE 1V8pB2zaEgl6QTP0HpJEYkBJ3Grd5ULnmiTf/79B6mEhDCxRQI8fD4fiOZb/0UtZKpuv TrTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=MjNVckWM; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y44si2931396plh.726.2017.07.21.04.16.15; Fri, 21 Jul 2017 04:16:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=MjNVckWM; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 71697783FF; Fri, 21 Jul 2017 11:16:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 8D2E6783E1 for ; Fri, 21 Jul 2017 11:16:11 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id d193so5172774pgc.2 for ; Fri, 21 Jul 2017 04:16:13 -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; bh=CJHxdEDvnTigaLOKYdmh7HOZ84VQtMx0WnAULO2D9kM=; b=MjNVckWMmuJvrwF6GMYlgCuRYfmSjW29VdNIiJbb+HuXj7LF3xV8Vla+djkuFfiLPo cnt8oskVnapX+lICqTFb+7DVqig6JP/H/fRoASdMtXYIJjrVeo+oNvNxpJdBO6KFa1FP 6vome+qVnvWuTMP7h5tBJAzwQE31nhHl6dLe2J2ys7xyHrZ/J0xSSU6BjL+UfkOFlDut AHp0wkUBxjWacA3cssaXOdI1L0cqixkbuP1wWm3c8DLJ0TXjBlpfWH8v97o4GUUAFacV WeyAYcO6fdjasFNcEPGA5DgbOcSDCXKb/JTlTXQtSaz9oh6ri9+jPFd9/eV85qAXDk0s BfMg== 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; bh=CJHxdEDvnTigaLOKYdmh7HOZ84VQtMx0WnAULO2D9kM=; b=nwO+/+clqPRKQBujgJ4bBFBHI5NUqXPy2tRwfmPbi9O2fMmRCWCWEWsr5XyCXChspG SPQD4eLSG13NsMhvA79jmxIpSeRiIrq6yBXJkDttcnKv2UXEdu1qcWLD8qjlhU1lT+yz 0w3a1GrBZO8yqmiriM0/77Yeot1rAIbyBAvYDO6fpIrUQA54zUrPXxaZF/oYD+C4WVlA nh7YG09d7/HdqpptokxneHOMKtw318mM1uNX9m8Oa/0Aw9OZ8geBOefkIQ3YIqOC2VaN x3zPltt6A79gajMWhLtnrnxFBm0xrRQtonU/cHOsE72vj6NhVLof/8vrozxqKhudEYXD p97Q== X-Gm-Message-State: AIVw1114GdTjU9eO3a8EvPaUcBdi8YWFnMWvM5XV+x6dx6tQnBJPxNsJ FlwI5agMgMFQdH4B X-Received: by 10.99.126.86 with SMTP id o22mr7084837pgn.385.1500635772466; Fri, 21 Jul 2017 04:16:12 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b16sm9129223pfm.84.2017.07.21.04.16.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jul 2017 04:16:11 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 21 Jul 2017 04:16:00 -0700 Message-Id: <20170721111602.2547-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [oe] [meta-networking][PATCH 1/3] openflow: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Regenerate configure before running oe_runconf Signed-off-by: Khem Raj --- .../recipes-protocols/openflow/openflow.inc | 3 +- ...use-strlcpy-from-libc-before-defining-own.patch | 64 ++++++++++++++++++++++ ...lib-netdev-Adjust-header-include-sequence.patch | 59 ++++++++++++++++++++ .../recipes-protocols/openflow/openflow_git.bb | 5 ++ 4 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch create mode 100644 meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-networking/recipes-protocols/openflow/openflow.inc index 0ae2d1f1d..cccbfa19a 100644 --- a/meta-networking/recipes-protocols/openflow/openflow.inc +++ b/meta-networking/recipes-protocols/openflow/openflow.inc @@ -27,9 +27,8 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig -do_configure() { +do_configure_prepend() { ./boot.sh - oe_runconf } do_install_append() { diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch new file mode 100644 index 000000000..952274bb9 --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch @@ -0,0 +1,64 @@ +From 7b62e5884353b247f542844d1e4687d0e9211999 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Jul 2017 04:27:32 -0700 +Subject: [PATCH 1/2] Check and use strlcpy from libc before defining own + +This is required especially on musl where +function prototype conflicts and causes build +failures. + +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + lib/util.c | 2 ++ + lib/util.h | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 13064f6..596c43f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,7 +57,7 @@ OFP_CHECK_HWTABLES + OFP_CHECK_HWLIBS + AC_SYS_LARGEFILE + +-AC_CHECK_FUNCS([strsignal]) ++AC_CHECK_FUNCS([strlcpy strsignal]) + + AC_ARG_VAR(KARCH, [Kernel Architecture String]) + AC_SUBST(KARCH) +diff --git a/lib/util.c b/lib/util.c +index 21cc28d..1f341b1 100644 +--- a/lib/util.c ++++ b/lib/util.c +@@ -138,6 +138,7 @@ xasprintf(const char *format, ...) + return s; + } + ++#ifndef HAVE_STRLCPY + void + strlcpy(char *dst, const char *src, size_t size) + { +@@ -148,6 +149,7 @@ strlcpy(char *dst, const char *src, size_t size) + dst[n_copy] = '\0'; + } + } ++#endif + + void + ofp_fatal(int err_no, const char *format, ...) +diff --git a/lib/util.h b/lib/util.h +index fde681f..9e45ea9 100644 +--- a/lib/util.h ++++ b/lib/util.h +@@ -41,6 +41,7 @@ + #include + #include + #include "compiler.h" ++#include "config.h" + + #ifndef va_copy + #ifdef __va_copy +-- +2.13.3 + diff --git a/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch b/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch new file mode 100644 index 000000000..75180fe32 --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch @@ -0,0 +1,59 @@ +From 5bba224edea38607e8732081f86679ffd8b218ab Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Jul 2017 04:29:04 -0700 +Subject: [PATCH 2/2] lib/netdev: Adjust header include sequence + +Specify libc headers before kernel UAPIs +this helps compiling with musl where otherwise +it uses the definition from kernel and complains +about double definition in libc headers + +Signed-off-by: Khem Raj +--- + lib/netdev.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/lib/netdev.c b/lib/netdev.c +index 3b6fbc5..c7de25e 100644 +--- a/lib/netdev.c ++++ b/lib/netdev.c +@@ -39,7 +39,6 @@ + #include + #include + #include +-#include + + /* Fix for some compile issues we were experiencing when setting up openwrt + * with the 2.4 kernel. linux/ethtool.h seems to use kernel-style inttypes, +@@ -57,10 +56,6 @@ + #define s64 __s64 + #endif + +-#include +-#include +-#include +-#include + #include + #include + #include +@@ -68,12 +63,16 @@ + #include + #include + #include +-#include + #include + #include + #include + #include + #include ++#include ++#include ++#include ++#include ++#include + + #include "fatal-signal.h" + #include "list.h" +-- +2.13.3 + diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb index 6403bfb22..eceb45e94 100644 --- a/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb @@ -2,3 +2,8 @@ include ${BPN}.inc SRCREV = "c84f33f09d5dbcfc9b489f64cb30475bf36f653a" PV = "1.0+git${SRCPV}" + +SRC_URI += "\ + file://0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch \ + file://0002-lib-netdev-Adjust-header-include-sequence.patch \ + " From patchwork Fri Jul 21 11:16:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108469 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp507206obm; Fri, 21 Jul 2017 04:16:25 -0700 (PDT) X-Received: by 10.99.52.72 with SMTP id b69mr6936021pga.240.1500635785768; Fri, 21 Jul 2017 04:16:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500635785; cv=none; d=google.com; s=arc-20160816; b=DF/PgqVNkc7VGthPPuMBbAOYHldUO4cC5OywvdUfzWAvVOo2OedNZ2VRbHx8Xk8TLS KcPHTxQ8+47zxfFN0LJwYhq1ilPjtSKj0rLuO6VCT4cDGMDhdeYppdoQqQclMcxj2z+H 7r7wMtn78i6daWfKDejK/PSDHfvNeJ9y3aCOGiG5f8wvl8WZZwO/WfiQmWTgDM0bzAqx T8RHRGn5WCR+SqdUNbRWefXLbRyYFLRa4IUMp4OEOPJY1JF1tnFAJj5UObLt5pqgWOi9 oDn+Ifp5zrgShWG1lx/HjYGYDrEVfUkPrSbZd/fQswIciWUzgd9U1/YXJzPB/xt5O1Ew l5ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=FSOebwlso9/DDHbBmoonsshLfWQUqvrsPrIu924bKnw=; b=MtSofdPyppeRO0tRsv+wBA3c63l2h10ng/tYf0jliC3zRUFaoKB87nrPibw8flvCVb pz83wdfKI8ftUEkw5J6y/eemv0Zw4GVhN6F7cEn/5a3c2G8CSnmbrkUiUvojygXHj2vL o/CWUzk0El7igUJuc86nXDxTgZYIaqCLDYAHTsIriUKBi4rN+wJSWD/SksZ4kUOpxlv2 vjWtp8jF2aKMpHYYkQZiyMmVKQEv1+l6QWktngeDm1jVfThDx3wfdJrLUVy2bw5r3rbc WHPYlsY03owwCi99eiocTot++HDXqDGBfOkdL92tVY//4uLMEIcGoI8m976nyfwXhTvp wCSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=CQM1ihcv; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d2si2951125plj.418.2017.07.21.04.16.25; Fri, 21 Jul 2017 04:16:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=CQM1ihcv; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1391678408; Fri, 21 Jul 2017 11:16:22 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id F3B09783FC for ; Fri, 21 Jul 2017 11:16:12 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id d18so4633101pfe.4 for ; Fri, 21 Jul 2017 04:16:14 -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:in-reply-to:references; bh=S8lWL0GVMgAvw49Q5rIhjES267baGFG+M6ex3Soo5Gk=; b=CQM1ihcvLM6l7lYCSBqna+HE05dCnwIdE5/zvNCfU78Nb7Hcp1Cd3vxEl6BewOub0C JyIO8x5RrGUL/mHHO/QrxRjnGBE23my96hUOisvPdsaEjvWh/OLLNIhm+LdejEB7b9FT 4leymiyMv8OMNDOY/riTWeRDN+CsSQUSPsd4RGSA7u+pixDyGbTyNv0ZLOF2dKak30J5 Nm38B6FnIrzIhd8msKboI+cb7NLhrae9AS8xYK1FA3HR4I05LqVqfkSV2+p8IDRa0LHS IpDHyy72PS/zb/WWUF7OKfOkKK27cDxjubLphju2lpgFPWBGaXxeHsoG+30bYD9hv3Oj rksQ== 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:in-reply-to :references; bh=S8lWL0GVMgAvw49Q5rIhjES267baGFG+M6ex3Soo5Gk=; b=CiswT0Rw/N8AVTjLCm1U7QJ7R6GnQymW7YJJt1WyI9DQNeHWMMthlJwA1HrtxCUzlT Fs/VjzGt59NTccYrUIdb7U2E22gTLNwANLMbuE4bUiwxhZ0LZNqz12qKtzYd/wP20xrt ZfQ4GomF6WJBdLTyv6Cvjt60N8sl0GwW8Ssr4gWl/ww8/AjbiX3wNKN+sGn1JbvXjw9b BPdXkkfF78A8EoNA5aq35rc1QZh8xpVTucNIZXYeDbHXTTyCsy/qW/whCB1qjmVKvcBZ ZuNBuEm7A5sxGGfCn4wE1sx4/xRTOVCpAYwuidKCcBFMCkXyt/x+ecH0o71ouZTKrI9S Bt9g== X-Gm-Message-State: AIVw110KzAlmiJNEuF6CV/WdmM4E1jDrUkJdxqalXsnPE5eFbts0cEWA Tm0t13fMUJWVVECW X-Received: by 10.99.36.5 with SMTP id k5mr7019819pgk.328.1500635773696; Fri, 21 Jul 2017 04:16:13 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b16sm9129223pfm.84.2017.07.21.04.16.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jul 2017 04:16:12 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 21 Jul 2017 04:16:01 -0700 Message-Id: <20170721111602.2547-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170721111602.2547-1-raj.khem@gmail.com> References: <20170721111602.2547-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 2/3] xl2tpd: Update to 1.3.9 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org License changes are cosmetic https://github.com/xelerance/xl2tpd/commit/1611d6f028fe30da4cee5b026fd1de81d97cba48 Signed-off-by: Khem Raj --- .../recipes-protocols/xl2tpd/xl2tpd.inc | 5 +- .../fix-inline-functions-errors-with-gcc-5.x.patch | 134 --------------------- .../recipes-protocols/xl2tpd/xl2tpd_git.bb | 4 +- 3 files changed, 3 insertions(+), 140 deletions(-) delete mode 100644 meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc index 6f7f69330..d037c7cfc 100644 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc +++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc @@ -6,12 +6,9 @@ DEPENDS = "ppp virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0636e73ff0215e8d672dc4c32c317bb3" - -INC_PR = "r0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/xelerance/xl2tpd.git \ - file://fix-inline-functions-errors-with-gcc-5.x.patch \ " S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch b/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch deleted file mode 100644 index b75c9129d..000000000 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd/fix-inline-functions-errors-with-gcc-5.x.patch +++ /dev/null @@ -1,134 +0,0 @@ -Upstream-Status: Backport - -Backport from https://github.com/xelerance/xl2tpd/commit/9098f64950eb22cf049058d40f647bafdb822174 - -Signed-off-by: Kai Kang ---- -From 9098f64950eb22cf049058d40f647bafdb822174 Mon Sep 17 00:00:00 2001 -From: Kai Kang -Date: Wed, 23 Sep 2015 10:41:05 +0800 -Subject: [PATCH] Fix build errors caused by inline function with gcc 5 - -GCC 5 defaults to -std=gnu11 instead of -std=gnu89. And -std=gnu89 -employs the GNU89 inline semantics, -std=gnu11 uses the C99 inline -semantics. - -For 'inline' fuction, it is NOT exported by C99. So error messages such as: - -| control.c:1717: undefined reference to `check_control' - -For these functions which is not referred by other compile units, make -them 'static inline'. - -For 'extern inline' function, it fails such as: - -| misc.h:68:20: warning: inline function 'swaps' declared but never defined -| extern inline void swaps (void *, int); -| ^ - -Because function swaps() is referred by other compile units, it must be -exported. The semantics of 'extern inline' are not same between GNU89 -and C99, so remove 'inline' attribute for compatible with GNU89. - -Ref: -https://gcc.gnu.org/gcc-5/porting_to.html - -Signed-off-by: Kai Kang ---- - control.c | 8 ++++---- - misc.c | 2 +- - misc.h | 2 +- - network.c | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/control.c b/control.c -index b2891a9..c4a39b5 100644 ---- a/control.c -+++ b/control.c -@@ -1140,7 +1140,7 @@ int control_finish (struct tunnel *t, struct call *c) - return 0; - } - --inline int check_control (const struct buffer *buf, struct tunnel *t, -+static inline int check_control (const struct buffer *buf, struct tunnel *t, - struct call *c) - { - /* -@@ -1276,7 +1276,7 @@ inline int check_control (const struct buffer *buf, struct tunnel *t, - return 0; - } - --inline int check_payload (struct buffer *buf, struct tunnel *t, -+static inline int check_payload (struct buffer *buf, struct tunnel *t, - struct call *c) - { - /* -@@ -1382,7 +1382,7 @@ inline int check_payload (struct buffer *buf, struct tunnel *t, - #endif - return 0; - } --inline int expand_payload (struct buffer *buf, struct tunnel *t, -+static inline int expand_payload (struct buffer *buf, struct tunnel *t, - struct call *c) - { - /* -@@ -1562,7 +1562,7 @@ void send_zlb (void *data) - toss (buf); - } - --inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c, -+static inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c, - int convert) - { - /* -diff --git a/misc.c b/misc.c -index 3092401..af90dbf 100644 ---- a/misc.c -+++ b/misc.c -@@ -170,7 +170,7 @@ void do_packet_dump (struct buffer *buf) - printf ("}\n"); - } - --inline void swaps (void *buf_v, int len) -+void swaps (void *buf_v, int len) - { - #ifdef __alpha - /* Reverse byte order alpha is little endian so lest save a step. -diff --git a/misc.h b/misc.h -index aafdc62..caab7a1 100644 ---- a/misc.h -+++ b/misc.h -@@ -65,7 +65,7 @@ extern void l2tp_log (int level, const char *fmt, ...); - extern struct buffer *new_buf (int); - extern void udppush_handler (int); - extern int addfcs (struct buffer *buf); --extern inline void swaps (void *, int); -+extern void swaps (void *, int); - extern void do_packet_dump (struct buffer *); - extern void status (const char *fmt, ...); - extern void status_handler (int signal); -diff --git a/network.c b/network.c -index b1268c6..d324a71 100644 ---- a/network.c -+++ b/network.c -@@ -135,7 +135,7 @@ int init_network (void) - return 0; - } - --inline void extract (void *buf, int *tunnel, int *call) -+static inline void extract (void *buf, int *tunnel, int *call) - { - /* - * Extract the tunnel and call #'s, and fix the order of the -@@ -155,7 +155,7 @@ inline void extract (void *buf, int *tunnel, int *call) - } - } - --inline void fix_hdr (void *buf) -+static inline void fix_hdr (void *buf) - { - /* - * Fix the byte order of the header --- -2.6.1 - diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb index 42bc398a1..88ae5d6f8 100644 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb +++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb @@ -2,7 +2,7 @@ require xl2tpd.inc # This is v1.3.6 plus some commits. There is no tag for this commit. # -PV = "1.3.6+git${SRCPV}" +PV = "1.3.9+git${SRCPV}" -SRCREV = "a96b345962622ea58490924130675df6db062d11" +SRCREV = "f114c10ac532051badeca0132b144a2f1596f047" From patchwork Fri Jul 21 11:16:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108470 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp507355obm; Fri, 21 Jul 2017 04:16:34 -0700 (PDT) X-Received: by 10.99.171.1 with SMTP id p1mr6992315pgf.140.1500635794079; Fri, 21 Jul 2017 04:16:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500635794; cv=none; d=google.com; s=arc-20160816; b=TkDIeAukYmuwxW7eLZQqZBqaPvlmfDkz0b85oiIHPllY7X6t96EqXM8Aguivo9NCO2 tOrAUAJTx5uX0iBsMDCSRd6+LVMiWepowc4zSVY6ojfq2rLOydcbWk8O1z/zNXliyXjz jyxdD4zIE70lAVSKs5NnnboB270tofJ3ue5HIarnMfXvdFGt/tGaK6Dgc0Fv2SD7pYOQ 5rneM1giWY5cCqVW36jPtFPTTh0INXqzhT3jPo/zgByoQKzNogKal5sYWwdG5/WY43dK amTVmCdt8JF4smJ4B2ppapyl9jvYF2E+RtPGTNBv72cjA5+YvKJyrI6q2IrDy0lrhyux +N4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=CkXz5ZnLF6ygvLYl+zVHF7/u9Rs9HTcE33IIeFqlK8Y=; b=GbDNI3zbY1qWF4gpQP4aRazl97NyYBu3qevSqAlD6U4cQ/r2wc6atoa996wzyMrvWY 2F1EgK5w/qolXgk84Wu3Jr1rXb03HJXUR69mO1h/m6KqIFrcNBV4TVZjUXO6sTiVlrD0 OZOFTlW4UBDS6kNO9NMXg9LXKdx7E7TxssdOgAQHTANfmwyYKkWMuKz4ShA8rwJ5IKiF 1YjssQZlmT0ZfvxHGS7X+SA49m9/k9aACfuVvusig21S9UIK8wq9mubgWpOtm+6Bh21q iArOnQagkC3o/0nL7au/Q57oqWuZQ5gZbhSk0yDjkTzbxy7whlqut66jpXMeMpDaJm9a 4jPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=RkITJ4hS; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t4si2974003plm.143.2017.07.21.04.16.33; Fri, 21 Jul 2017 04:16:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=RkITJ4hS; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 51F3778413; Fri, 21 Jul 2017 11:16:28 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 4CF1678401 for ; Fri, 21 Jul 2017 11:16:13 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id a11so4632727pfj.3 for ; Fri, 21 Jul 2017 04:16:15 -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:in-reply-to:references; bh=r/FUjjdB0SvRr3Hm4pepyilSL+AG1otUFlo7IQgUIeU=; b=RkITJ4hSn5IA6WR63foMYA/gZXtBF8Dvq3VMjFq5qcHI5uGXTpajts9R9Lpp1IDaco c5crkYzqVECddo03+UyCj+WmOJ71lvJg3Ji4xPftmrwGTx+leaXw1tUANvVWZJm8bZjt ILUZgvjDmmcardRgtSZiqlBjQanSNP6N2fREu2/Cjs96yAC/5yVAgnaQxFj79tQquNG5 fvi+dZs3VzNmQSg5XCRWYYt5pUbRIleJDvHw4MyihxGky6wrLgG7axayitZy+20FYasM 2HqCOUwEYEY62YMJ3zQcjcHJ6wbs+bpcZ1DSzLi5D4msjIOdU0jMbzHBFbXTsp/Zhw7g nDrQ== 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:in-reply-to :references; bh=r/FUjjdB0SvRr3Hm4pepyilSL+AG1otUFlo7IQgUIeU=; b=f9wHI+as5qwcCnuIAf8zH6ayOXSq6jli8QM4fs+ldHKkTnXh2sKtHWBj37iHWKsS8M 4Q6tA9nq4CHMNBQdVxpBkzM97d6avwILA0fYWiakVZvScNc277tYEg6vDk39a958r3iW ghKa8LzJz4dxcUNDEzqq9vGHfUjX6z0egANpsDPaptkbaqorhzgS70h6/FGDkIiR6jMs VBhSLwVGvKjcLGpWZNX7m9M/lrYprdrlKh4uGh9Dh38HjL2GkdRMAu8psSo8/ZqAjA/c R1xs4MsK6uY+AfjUlEmLSZofCOop3QNqjuaFSxH09VT0CVKOz/GU5MXQi3A0kdJxdvcL l/Qw== X-Gm-Message-State: AIVw112QNT0NiPQlruF/Kx/ERHqSVf+o6o4I/BsRiZoNtCSJTM5Rd5mT QDBUPqqYcyUox7P7 X-Received: by 10.99.1.88 with SMTP id 85mr6957420pgb.315.1500635775078; Fri, 21 Jul 2017 04:16:15 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id b16sm9129223pfm.84.2017.07.21.04.16.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jul 2017 04:16:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 21 Jul 2017 04:16:02 -0700 Message-Id: <20170721111602.2547-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170721111602.2547-1-raj.khem@gmail.com> References: <20170721111602.2547-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/3] wvstreams: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-Check-for-limits.h-during-configure.patch | 26 ++++ ...sk-Dont-use-ucontext-on-non-glibc-systems.patch | 135 +++++++++++++++++++++ ...k-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch | 27 +++++ .../0004-wvcrash-Replace-use-of-basename-API.patch | 28 +++++ ...05-check-for-libexecinfo-during-configure.patch | 30 +++++ .../wvdial/wvstreams/argp.patch | 37 ++++++ .../recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 9 +- 7 files changed, 291 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch new file mode 100644 index 000000000..b092ba2fc --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch @@ -0,0 +1,26 @@ +From 7deaf836d1f1b9e4426818584b4267f8c4a095aa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Jul 2017 21:04:07 -0700 +Subject: [PATCH 1/5] Check for limits.h during configure + +Signed-off-by: Khem Raj +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index fe0fa2b..188adfe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -139,6 +139,8 @@ int main() + [Compiler warning on deprecated functions])]) + CPPFLAGS="$CPPFLAGS_save" + ++AC_CHECK_HEADERS(limits.h) ++ + # argp + USE_WVSTREAMS_ARGP=0 + AC_CHECK_HEADERS(argp.h) +-- +2.13.3 + diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch new file mode 100644 index 000000000..232db9e63 --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch @@ -0,0 +1,135 @@ +From 0e054339c1422168a7f4a9dcf090268053a33b1f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Jul 2017 21:05:37 -0700 +Subject: [PATCH 2/5] wvtask: Dont use ucontext on non-glibc systems + +Signed-off-by: Khem Raj +--- + utils/wvtask.cc | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/utils/wvtask.cc b/utils/wvtask.cc +index cdcd544..c0bff7d 100644 +--- a/utils/wvtask.cc ++++ b/utils/wvtask.cc +@@ -199,7 +199,9 @@ WvTaskMan::WvTaskMan() + stacktop = (char *)alloca(0); + + context_return = 0; ++#ifdef __GLIBC__ + assert(getcontext(&get_stack_return) == 0); ++#endif + if (context_return == 0) + { + // initial setup - start the stackmaster() task (never returns!) +@@ -265,13 +267,17 @@ int WvTaskMan::run(WvTask &task, int val) + state = &old_task->mystate; + + context_return = 0; ++#ifdef __GLIBC__ + assert(getcontext(state) == 0); ++#endif + int newval = context_return; + if (newval == 0) + { + // saved the state, now run the task. + context_return = val; ++#ifdef __GLIBC__ + setcontext(&task.mystate); ++#endif + return -1; + } + else +@@ -319,13 +325,17 @@ int WvTaskMan::yield(int val) + #endif + + context_return = 0; ++#ifdef __GLIBC__ + assert(getcontext(¤t_task->mystate) == 0); ++#endif + int newval = context_return; + if (newval == 0) + { + // saved the task state; now yield to the toplevel. + context_return = val; ++#ifdef __GLIBC__ + setcontext(&toplevel); ++#endif + return -1; + } + else +@@ -341,7 +351,9 @@ int WvTaskMan::yield(int val) + void WvTaskMan::get_stack(WvTask &task, size_t size) + { + context_return = 0; ++#ifdef __GLIBC__ + assert(getcontext(&get_stack_return) == 0); ++#endif + if (context_return == 0) + { + assert(magic_number == -WVTASK_MAGIC); +@@ -371,7 +383,9 @@ void WvTaskMan::get_stack(WvTask &task, size_t size) + // initial setup + stack_target = &task; + context_return = size/1024 + (size%1024 > 0); ++#ifdef __GLIBC__ + setcontext(&stackmaster_task); ++#endif + } + else + { +@@ -409,7 +423,9 @@ void WvTaskMan::_stackmaster() + assert(magic_number == -WVTASK_MAGIC); + + context_return = 0; ++#ifdef __GLIBC__ + assert(getcontext(&stackmaster_task) == 0); ++#endif + val = context_return; + if (val == 0) + { +@@ -419,7 +435,9 @@ void WvTaskMan::_stackmaster() + // all current stack allocations) and go back to get_stack + // (or the constructor, if that's what called us) + context_return = 1; ++#ifdef __GLIBC__ + setcontext(&get_stack_return); ++#endif + } + else + { +@@ -474,7 +492,9 @@ void WvTaskMan::do_task() + + // back here from longjmp; someone wants stack space. + context_return = 0; ++#ifdef __GLIBC__ + assert(getcontext(&task->mystate) == 0); ++#endif + if (context_return == 0) + { + // done the setjmp; that means the target task now has +@@ -510,7 +530,9 @@ void WvTaskMan::do_task() + } + else + { ++#ifdef __GLIBC__ + assert(getcontext(&task->func_call) == 0); ++#endif + task->func_call.uc_stack.ss_size = task->stacksize; + task->func_call.uc_stack.ss_sp = task->stack; + task->func_call.uc_stack.ss_flags = 0; +@@ -521,9 +543,11 @@ void WvTaskMan::do_task() + (void (*)(void))call_func, 1, task); + + context_return = 0; ++#ifdef __GLIBC__ + assert(getcontext(&task->func_return) == 0); + if (context_return == 0) + setcontext(&task->func_call); ++#endif + } + + // the task's function terminated. +-- +2.13.3 + diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch new file mode 100644 index 000000000..f9304197a --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch @@ -0,0 +1,27 @@ +From f1fc9f4d523dd8b773a4535176547b0619ec05c6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Jul 2017 21:08:57 -0700 +Subject: [PATCH 3/5] wvtask: Check for HAVE_LIBC_STACK_END only on glibc + systems + +Signed-off-by: Khem Raj +--- + utils/wvtask.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/wvtask.cc b/utils/wvtask.cc +index c0bff7d..716344b 100644 +--- a/utils/wvtask.cc ++++ b/utils/wvtask.cc +@@ -563,7 +563,7 @@ void WvTaskMan::do_task() + + const void *WvTaskMan::current_top_of_stack() + { +-#ifdef HAVE_LIBC_STACK_END ++#if defined(HAVE_LIBC_STACK_END) && defined(__GLIBC__) + extern const void *__libc_stack_end; + if (use_shared_stack() || current_task == NULL) + return __libc_stack_end; +-- +2.13.3 + diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch new file mode 100644 index 000000000..6f3fbffbd --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch @@ -0,0 +1,28 @@ +From bfe68126693f9159f7ac66a69217e0b5f43e5781 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Jul 2017 21:11:21 -0700 +Subject: [PATCH 4/5] wvcrash: Replace use of basename API + +musl does not have this API + +Signed-off-by: Khem Raj +--- + utils/wvcrash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/wvcrash.cc b/utils/wvcrash.cc +index 0417759..3d160b7 100644 +--- a/utils/wvcrash.cc ++++ b/utils/wvcrash.cc +@@ -404,7 +404,7 @@ extern void __wvcrash_init_buffers(const char *program_name); + void wvcrash_setup(const char *_argv0, const char *_desc) + { + if (_argv0) +- argv0 = basename(_argv0); ++ argv0 = strrchr(_argv0, '/') ? strrchr(_argv0, '/')+1 : _argv0; + __wvcrash_init_buffers(argv0); + if (_desc) + { +-- +2.13.3 + diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch new file mode 100644 index 000000000..25e9ee236 --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch @@ -0,0 +1,30 @@ +From fd9515f08dcdafea6ae03413fbe5a43a6438fe3e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Jul 2017 21:25:48 -0700 +Subject: [PATCH 5/5] check for libexecinfo during configure + +Signed-off-by: Khem Raj +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 188adfe..1ab4d3c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -159,6 +159,12 @@ AC_SEARCH_LIBS([argp_parse], [argp c], [], [ + USE_WVSTREAMS_ARGP=1 + fi + ]) ++ ++USE_LIBEXECINFO=0 ++AC_SEARCH_LIBS([backtrace], [execinfo], [], [ ++USE_LIBEXECINFO=1 ++]) ++ + # Function checks + AC_HEADER_DIRENT + +-- +2.13.3 + diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch new file mode 100644 index 000000000..e85721363 --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch @@ -0,0 +1,37 @@ +Check for argp_parse in libargp and then in libc before using internal version + +Index: wvstreams-4.6.1/configure.ac +=================================================================== +--- wvstreams-4.6.1.orig/configure.ac ++++ wvstreams-4.6.1/configure.ac +@@ -142,20 +142,21 @@ CPPFLAGS="$CPPFLAGS_save" + # argp + USE_WVSTREAMS_ARGP=0 + AC_CHECK_HEADERS(argp.h) +-AC_CHECK_FUNC(argp_parse) +-if test "$ac_cv_func_argp_parse" != yes \ +- -o "$ac_cv_header_argp_h" != yes ; then +- ( +- echo ++AC_SEARCH_LIBS([argp_parse], [argp c], [], [ ++ ++ if test "$ac_cv_func_argp_parse" != yes \ ++ -o "$ac_cv_header_argp_h" != yes ; then ++ ( ++ echo + echo 'configuring argp...' + cd argp + ./configure --host=$host_cpu-$host_os || exit $? + echo 'argp configured.' + echo +- ) || exit $? +- USE_WVSTREAMS_ARGP=1 +-fi +- ++ ) || exit $? ++ USE_WVSTREAMS_ARGP=1 ++ fi ++]) + # Function checks + AC_HEADER_DIRENT + diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index 607a6178f..0ac175251 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -5,6 +5,7 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "zlib openssl (>= 0.9.8) dbus readline" +DEPENDS_append_libc-musl = " argp-standalone libexecinfo" SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ file://04_signed_request.diff \ @@ -12,7 +13,13 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ file://06_gcc-4.7.diff \ file://07_buildflags.diff \ file://gcc-6.patch \ - " + file://argp.patch \ + file://0001-Check-for-limits.h-during-configure.patch \ + file://0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch \ + file://0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch \ + file://0004-wvcrash-Replace-use-of-basename-API.patch \ + file://0005-check-for-libexecinfo-during-configure.patch \ + " SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"