From patchwork Mon Mar 5 03:01:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 130611 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2206237lja; Sun, 4 Mar 2018 19:01:34 -0800 (PST) X-Google-Smtp-Source: AG47ELt/8ea+8egtR3aNSEsqWMjZtPgsw4PNP0hLkTL2m2GSBjhPtLIAWIZGbzD3Gm6ndyv2PJiR X-Received: by 10.98.144.146 with SMTP id q18mr13991410pfk.103.1520218894044; Sun, 04 Mar 2018 19:01:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520218894; cv=none; d=google.com; s=arc-20160816; b=Di17OVe5StA4jV4RtIgTe2EWz3cYan2jfjJ2ewv7nBj3BeUHlLqc5LmUDVqEj8qhq9 pPEJjidriyFnCMBwwyMOEcb61LwxMDZxrDOf0e98Vgk/C5bgVQFC/uIc0bcIa+gGYuA5 l7lV+nOyx4+YeThISu6/8r1DDbc2sOrmO1gTk9uJFsoEwwfsj7FNxfVXnE5zyzM56qrQ MMe9DGuIq66Isb7bTlx6Fjxb734Kj5ISmsP6bAHPXi3znK8WJgGtccmLDDIjahzYpcEq i9k+/pdaLHqD+3Cx75q/K78i2+M+yiUWPanY6psc/ukXrJgLQbkvvOLRS8Lk6jRzwmgN xN2Q== 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=RrjIuP58WKx1M72x3O6r0Bf6eAe8ii4BIhmpuuuVSKE=; b=vY80LwwywgIbgXgw/AXE1pGvHxpKHTvoVmxrE2oVwqVtej40DU7WGPP8MwVk8IrADF 1QzESaSteWcfvrU5Kk6BFWNtU3QPuRDIT2Mwm6/A+QQWliv6072DP5mb36mMm7LgHmad ctBqmm3/7HgEjHG/fH5y4l1XgUFntEgBsKIMnrRs8brwCx1OwSsJONvglxgSOsduUajW VLsGoaNyHljIsqUgk3fcipAAGUY2tjNdxoT0Lj6hJm9IVXao3U/67OQ/KgFkLXeR6z1t d3kNvUKoWVMt3HKE4eRok3m5fHlmIqjRfgg2t+J+MVx0gqxT8PhiLYmaf0jkUHSdrCje IEGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GYJPb7AA; 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=QUARANTINE 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 3-v6si8583143pls.766.2018.03.04.19.01.33; Sun, 04 Mar 2018 19:01:34 -0800 (PST) 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.s=20161025 header.b=GYJPb7AA; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 943E678AAA; Mon, 5 Mar 2018 03:01:27 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 226F17870E for ; Mon, 5 Mar 2018 03:01:25 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id i14so6290284pgv.3 for ; Sun, 04 Mar 2018 19:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=yHOUNqicfE6wdIZsPqruLLRIWnIea8uLWHQ8dTVPZaw=; b=GYJPb7AAD8DPNYfDM4xfM/sU3S6AuBUULJcSd0jEosFlJetNwA8UixcpHt1fJ1SLib h2hjiZ8oI1LLB4ClK7TxQMSNhJ6zOZR2olh8m2eK+IDa5lsSZbs0u2LHQGsw1MLjDGGD lpiy8Qkz5HN6StB07tj/XWsHISBXZZHxfdC1oqkXDLjB5NV3y9gF5WZJcN7A7UIPKQje qXAMtzLu2X/UsKp/3YGn+nWC2gk3EbAaV1YBPv3WTwuyAeHSmQkyZsT2m35j2/hxhzp0 +5bDMgbnaGmtniUUfzfMcPyzXHeKlXIK7m/iz8o9grElvn8QJUdOxIrmcblrdNZ5GdiT Kp2w== 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=yHOUNqicfE6wdIZsPqruLLRIWnIea8uLWHQ8dTVPZaw=; b=oTE1OaybwE0Zm3/MoU9sK/VHhKRHpVqzRdscPdVs+R+R7ePaTXliaaqD7OXMYb3aIb pzL8DwVNLlOw7N+Op3FnBvu+/lq5KGw4ajatiAcfyuuuAJFOy9xl/GMZtnmVQccGeGR6 RRR2NtbuuNC0DCbhfiy8meoeVgYwkGj8rkgprfmRzPDtbv45q11fK3eYDD7ZyoPmk62p QARW4ysoNO9Ii1qwaZkcCjUWA8J6ZoJ8sId2grYk1Jlsp9u7dw0mny4Kv7ViCCJJVG7j wTuXqHM2vTdm4D7fC1WqTZ9jQ5nuyUvVNdvlpQUgUJrv2RIKOO1vTTIG8elhTIZoE3Iu G66g== X-Gm-Message-State: APf1xPBAGBvO8AZNCHEZRWmfFg+NHJGPF7u9G+SbpL32pxuq+V6xO6UH 9b0VXwxTneg7L0TAXB4xUmGIFg== X-Received: by 10.98.73.140 with SMTP id r12mr13761424pfi.229.1520218886344; Sun, 04 Mar 2018 19:01:26 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id t85sm24136961pfg.159.2018.03.04.19.01.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Mar 2018 19:01:25 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 4 Mar 2018 19:01:15 -0800 Message-Id: <20180305030116.1901-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [oe] [meta-oe][PATCH 1/2] libyui-ncurses: Fix build with musl _nl_msg_cat_cntr in not available 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-use-_nl_msg_cat_cntr-only-with-glibc.patch | 40 ++++++++++++++++++++++ .../recipes-graphics/libyui/libyui-ncurses_git.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch -- 2.16.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch new file mode 100644 index 000000000..8e3774c1a --- /dev/null +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch @@ -0,0 +1,40 @@ +From 4b84f243a70a8c07f6a38dad3c9411fa707f25c9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 4 Mar 2018 17:08:43 -0800 +Subject: [PATCH] use _nl_msg_cat_cntr only with glibc + +The musl libc provides libintl (similar to glibc) +but does not use the same internals, +so even though we are using the GNU gettext +the libintl included with the libc does not define +_nl_msg_cat_cntr and it does not need to. + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/NCi18n.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/NCi18n.h b/src/NCi18n.h +index 165b0e7..bfc4ed7 100644 +--- a/src/NCi18n.h ++++ b/src/NCi18n.h +@@ -59,12 +59,13 @@ inline void setTextdomain( const char * domain ) + bindtextdomain( domain, YSettings::localeDir().c_str() ); + bind_textdomain_codeset( domain, "UTF-8" ); + textdomain( domain ); +- ++#if defined(__GLIBC__) + // Make change known + { + extern int _nl_msg_cat_cntr; + ++_nl_msg_cat_cntr; + } ++#endif + } + + +-- +2.16.2 + diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb index f60c85668..578c71301 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ + file://0001-use-_nl_msg_cat_cntr-only-with-glibc.patch \ " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" From patchwork Mon Mar 5 03:01:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 130612 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2206519lja; Sun, 4 Mar 2018 19:01:54 -0800 (PST) X-Google-Smtp-Source: AG47ELv2a5Yik8JbSG2hc9CxXYiiGzsZEPwWYZGVpbqXoEGxxTekFyIsxmSZBe+Vx9LXr07Wq030 X-Received: by 10.98.182.26 with SMTP id j26mr13735847pff.223.1520218914397; Sun, 04 Mar 2018 19:01:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520218914; cv=none; d=google.com; s=arc-20160816; b=yE2oB5D2QjG/3/4zlwN4wLk/oRpNwoxj8b/qu3gBZa8uqGSJGZufThtarOe4liA/m/ CqACwOy1ASq6by6GSVQ/G+Oyx9MBYkekE3HqmUI3EehCBqBoIur7tk83sNchrH55afA7 Rf0c2OsJHFxNEG0/dHk63sRWVUOA3JT4PZFl3OzIh/YPkP2t5Bmul1fxR3nie6Yf/rP0 9CqVQ3VplhUVAzqKZHK15jPi40tpxat0Y+Fl5UjwjvAyKbmmRfKi+pRWbCmXdc1M/B4h MaVBurK19SltnTkFVXuzMVXzjEnqrMDVrAImOgUTbjjeEHt6SSH+8Ej9EIZ9pZure9RO T8Cw== 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=XB/Y/FO1NiUQgRJ1KIIGDVbTyTqG13YOmO9/gmoThEs=; b=nPSyl1M2F3SKfjhsv4gLkJFjWUb2NZJJyntqGucdrMCCb979XFNxywI9MfWD84YYi6 705GlZQwltN/QUSAz7MfRNaAZS/4LRfM02BXeWc/cjCUQeSd9x6S/lz/nK/CjkskMEgS hdbcwMjBtBzCLQe+K5OYil4sWWyUoKGScWlKhyLi4wX0j57Oj7qyYUej9qB0vXU4KAF0 AeuRh6zwV0YimJ54pxqhsfaTVKCa4qdiLL0CzBSKkeBnGImpHQVjUEk94ijXfVdkT/4R JLovq4CB0VKX3cG21+h156nHV1QIE09F7pZ5w1joHT9IyJmgfYvsMLIe2r2X1P2mMVUm lzGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sPqCaSE8; 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=QUARANTINE 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 w27si9501793pfl.142.2018.03.04.19.01.54; Sun, 04 Mar 2018 19:01:54 -0800 (PST) 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.s=20161025 header.b=sPqCaSE8; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1EC5778AAF; Mon, 5 Mar 2018 03:01:51 +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 6C8BD78A89 for ; Mon, 5 Mar 2018 03:01:27 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id x1so4745211pfh.7 for ; Sun, 04 Mar 2018 19:01:29 -0800 (PST) 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=DX+nhIXMCLsX74e0sEWOhJeHd0qOvuQjRrPDQuwou/M=; b=sPqCaSE8qnSToEeU1vLpl3/0KnrwBELOMLhlBBiNyl/8NdhhtxUlkI2e+2X/MdBiRN aIdNtiDGYbcbXylP9YtIMZyn6hOpTWiQxRXb26dxWHOMgIl67qqywx1K+GuSS42+Y/Y/ sFsR5Vvd7lfe4AN15iSn/cpx6yH5WdZEasV3IyEq90t2LRe9aHAk2TuAKE/B8bzDN02p YxoLOiws+l/amrnrwv1XRa8B0hIoFTtUqam0DkyRR2sOAoy1ufDcjKtFuNS74oUjmCeq w9p7+5sIV/+XJiZtMTE3aB2YVTKo/48V7h8UOj/pa0igQGQnH43vr1D9PFxdoc2jVviO goaQ== 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=DX+nhIXMCLsX74e0sEWOhJeHd0qOvuQjRrPDQuwou/M=; b=mybTYbzERCR1dgsPC+K+/rJpT/KdfX9DlGjmEh50uO4VgnNqlb39BMQDwG4T0v8sLC M8hMPIllSBDd9aUDRAzY0n2JYwTV3Hhwd+DP6QHzoV8rBJ0Je2/sQSbnhfpjIQLGd+lI kQJjdltMuEYSUDD+xmo0ASx3GO0vtklwGT+1TmvASBCvH+xQiFGTc312IueubsNwNDSA 1K9Jx+h0zjtbsSdxRBoqwEQ5g9TN4eFaNxoVEOElcuHONG3naPU5k3lFik6kd0lMg5R/ QYPwlRe/2p35bjc80ktm1+CmKAQNwrFuUnb3WEGHFyxlVGNFKaFoYhKibg8AmczTU6Nm ftYg== X-Gm-Message-State: APf1xPD4p5ik8i3D116aUDk0+7re3lrEFkslSWMQBTfHWDhYXkLKbMJi WyahzO4hb0GX/HmIMyrsNjStNA== X-Received: by 10.98.153.157 with SMTP id t29mr13904287pfk.201.1520218888463; Sun, 04 Mar 2018 19:01:28 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id t85sm24136961pfg.159.2018.03.04.19.01.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Mar 2018 19:01:26 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 4 Mar 2018 19:01:16 -0800 Message-Id: <20180305030116.1901-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180305030116.1901-1-raj.khem@gmail.com> References: <20180305030116.1901-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 2/2] ebtables: Fix duplicate definition errors due to netinet/ether.h 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 Make the patch musl specific as it is regressing glibc 2.27 Signed-off-by: Khem Raj --- Changes since v1: - Drop the new patch since it was reverting existing patch partially - Apply the regressing patch conditionally to musl builds alone meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.16.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index d5e7341a0..e4adafd3c 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -29,9 +29,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://0007-extensions-Use-stdint-types.patch \ file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ - file://0010-Adjust-header-include-sequence.patch \ " +SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch" + SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d"