From patchwork Fri Jul 14 05:40:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 107727 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp454577qge; Thu, 13 Jul 2017 22:42:42 -0700 (PDT) X-Received: by 10.84.217.152 with SMTP id p24mr14118771pli.276.1500010962163; Thu, 13 Jul 2017 22:42:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500010962; cv=none; d=google.com; s=arc-20160816; b=CAPai7eUQGnv/sjnSGHfh5v9TSGuLtlicxLHqbtYIdd43iUv4XK3qHRVINBTHx+w4Y 4koKOl3TMciJ5AirgL87AlAQPQb0zaZ4mqVxWZF8UwRiaB5RSxz4tZDe+CsfYqhg1naK X7OBppHwIClKqCQwEQQTr+IYx+ivnNNxuHpZGKDl1rR0deNtnu1vHaSuD7o3nBqF9NcT WMpACvIxuhLGdWipLYQqfE5N4hDjuPC3RFNpBGNoWKxsAn2EuW8EhZLmQpBZOf5rsDF0 lFkrktAu8c8J1PB9YUwq0ddobLy9JF6mrse1jum2KaXrfRt6QG8QN7dsc06FnbrRfted 4zFQ== 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=JaUQL/gCKFHNcd16QdGOSosOaEiclMkmdCyhWM27Jsc=; b=xpI5S+xH5bNPAdUKToC5mS+7mrHsEuaUASbiwGXwAkukA/d8bUJmhOjQz6Psv0K+Iw 7BCtuYyu3Xc5/3z6Acyj0h1o3q/weC94XFXO65jemALI/O3qAFST0BIRNui46dMkbEC8 ThKG+jAzGI/ZGTCNId3B0Qe4ixVL/BaLxcr9RarXPQfqheQhULAEpryVcr7OTPHXEf2s nfplc4cDUPVfHIC7ZX6mCNIC7ZdUCOATWdzTPWbyeSs7PzefRwWl37E0XTZ227VSj9j2 aj/RzBimH0YwdGGDA0oZYEZsg319KDJ9it0wxkRV+ApAU6pEAzoleiRvaVczhny2UHsN q2SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=kalWSY7f; 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 w129si5594390pfw.229.2017.07.13.22.42.41; Thu, 13 Jul 2017 22:42:42 -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=kalWSY7f; 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 BA11478236; Fri, 14 Jul 2017 05:41:41 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id AF50578152 for ; Fri, 14 Jul 2017 05:40:38 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id u62so9393490pgb.0 for ; Thu, 13 Jul 2017 22:40:40 -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=pCuvorYrSH+iU+SgCEftk8MF7dDshkppunByBb5nxrI=; b=kalWSY7fxzmImxnZXU2R2P9v0n/bUeiChhM/rduL9pbCLB2UANcKVf3XVp3pwYH2mE VJ3qzMCvwk2HSV48eilr0whNJZ+rFE4MFiyeSU1WjMZ6L0NtLLELokTM9uR7XZsVUYHy NSgs8tyZbFNis2uFldHGmumrUynb0tIu1HrVUt7dGpy/+X0y89ZqBavS1hlyUJa/qiUx rTHzs/5zZO1wwnNU1Wbwt313nfDZcelQYiJAPYWI5tR2q9WYlwD5J+80hNK3xUZ1A9+f fNyKEihwnvJVsxR0wTuD5ygJDjMTMWK4T+HMdohTMbZjnqaIAWp7h/zr3EeFfuPP1HMP DSPQ== 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=pCuvorYrSH+iU+SgCEftk8MF7dDshkppunByBb5nxrI=; b=S8UOBLpzC3Y+BRnVBNXAiyVGn4Bgj5G7bQKLYQqWvLHnjRiB0Ga6CJFqs6yMJqzp5g DzSYRwiyhpK0H5/4EDas9MF69OrK3idYPCe351N3cjqx12/0SXHVM9hJ797ruDJ/ncxf LGLDr9uB1ua+aG6UVS700D0FSEcswHCZ5F0EbPOOVSb2jdW8tTf6tKiudVwJMGOZE9Wr dJvGAM9xtLwrmN/QUit7lc5su9tmk/QfiEJ2T52HGCxngLg6h5VOgmd5bqmmk7W9Tb9O HEmC7pcKa2Y484fw1Z/tM1vLtg2xP/LD5pcGohiY6cQMXAJsrCIIk2VdSAT8OjvD5qdg N8Qg== X-Gm-Message-State: AIVw110xeqKf7h0fyPg1Jjw5Y4a7PffzDxEKVTcpYa7uOEY24sBWJwRB 0p1OoispwaWge6Bw X-Received: by 10.84.169.67 with SMTP id g61mr13908491plb.155.1500010839540; Thu, 13 Jul 2017 22:40:39 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id z86sm17519420pfl.40.2017.07.13.22.40.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 22:40:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 13 Jul 2017 22:40:06 -0700 Message-Id: <20170714054013.34458-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170714054013.34458-1-raj.khem@gmail.com> References: <20170714054013.34458-1-raj.khem@gmail.com> Subject: [oe] [meta-gnome][PATCH 11/18] onboard: 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 --- ...m-Define-error-API-if-platform-does-not-h.patch | 67 ++++++++++++++++++++++ .../recipes-support/onboard/onboard_1.4.1.bb | 4 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch new file mode 100644 index 000000000..fda37895c --- /dev/null +++ b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch @@ -0,0 +1,67 @@ +From 1c95f64aa342147387ce4b1b7269a5c8b34bd898 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 09:01:04 -0700 +Subject: [PATCH] pypredict/lm: Define error API if platform does not have it + +error() API is not implemented across all libcs on linux +e.g. musl does not provide it. + +Signed-off-by: Khem Raj +--- + Onboard/pypredict/lm/lm.cpp | 1 - + Onboard/pypredict/lm/lm.h | 13 +++++++++++++ + Onboard/pypredict/lm/lm_dynamic.cpp | 2 -- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp +index 2e64296..37ae241 100644 +--- a/Onboard/pypredict/lm/lm.cpp ++++ b/Onboard/pypredict/lm/lm.cpp +@@ -19,7 +19,6 @@ + + #include + #include +-#include + #include + #include + #include +diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h +index ed4164a..b8b63ee 100644 +--- a/Onboard/pypredict/lm/lm.h ++++ b/Onboard/pypredict/lm/lm.h +@@ -32,6 +32,19 @@ + #include + #include + ++#if defined(HAVE_ERROR_H) ++#include ++#else ++#include ++#define _onboard_error(S, E, F, ...) do { \ ++ if (E) \ ++ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ ++ else \ ++ err(S, F, ##__VA_ARGS__); \ ++} while(0) ++ ++#define error _onboard_error ++#endif + + // break into debugger + // step twice to come back out of the raise() call into known code +diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp +index 7c62824..e7c7f40 100644 +--- a/Onboard/pypredict/lm/lm_dynamic.cpp ++++ b/Onboard/pypredict/lm/lm_dynamic.cpp +@@ -17,8 +17,6 @@ + * along with this program. If not, see . + */ + +-#include +- + #include "lm_dynamic.h" + + using namespace std; +-- +2.13.2 + diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb index 3a4f18971..10765ee0c 100644 --- a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb @@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e" DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native" -SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz" +SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz \ + file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ + " SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865"