From patchwork Tue Mar 7 07:13:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94937 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765235qgd; Mon, 6 Mar 2017 23:14:58 -0800 (PST) X-Received: by 10.98.212.7 with SMTP id a7mr26339736pfh.34.1488870897964; Mon, 06 Mar 2017 23:14:57 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v5si21603600pgj.302.2017.03.06.23.14.57; Mon, 06 Mar 2017 23:14:57 -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; 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 8E2CB774D8; Tue, 7 Mar 2017 07:14:54 +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 5213C71A82 for ; Tue, 7 Mar 2017 07:13:59 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 77so9356600pgc.0 for ; Mon, 06 Mar 2017 23:14:01 -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=MRKIje+95L44UN46oxMfFouzXwwNFI7+ODEnjb/sRYs=; b=taz5ETA3LbWPDszncgzbOtlLF9hSsZpi018l68GpicT1GElWFByomX7jqB30l16bea E/szoe3VfK6ynCtwrDWwCvAtWuY+TIG5I/l9DI8Nx/Xl/JlZl5QsuD7lEivlhZ4cLmlz 0rbgaNJQEJchBtaXqAuVt2x94ncpzctgn0Yrywr6ZdYgu0KCheTIiEoNEr0Vy3bhRQsW Clz6ECBxl+CdcjVzFwTFMFEbYlZfX89lkaI4hlDhER24BJ5v7X89LgwRPSwNDH3LMZp4 OuGVU4KaoSF+YdkDX3rV6bXHqLWJfmF8uAhG+6+VGW4e0aAXszM9dmRYnrKtCo9OKj2y ScOw== 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=MRKIje+95L44UN46oxMfFouzXwwNFI7+ODEnjb/sRYs=; b=ihYVId4wYuIX9yvKYVF+/d8gc7gsUgeAbWbQnn2JHZXptOFT1AvTybq4yAh2HUaizs WsYuGgQZdOvei5NkNfpwpREChUJhduDaqbNluYT0/xlnXxdvpq7b1jj1SBpn4Sm8tOMJ AkI+ymG6IXOZrQkzS8vcF+7Xy4YfFiXzPjrZDS/iVqdM45bYAXLMccet0FzmhhcCQA6i hYiE8JEbhzy77dX3peTZTGcNf+6xB/v+HYqht4Rqy9dqeKLsHNCpxn4Um6T+bI04qg+A Pj/aCR+GgACA3LOhIMIaw7jZKhcByrO1ZrCMDVi2m9u2x985hdth+VQOwwHiVqXMQMuF VM5Q== X-Gm-Message-State: AMke39mtVRFcYhcLotIJ2wSdVpYprd4k8EPyMZ6JG8QWjNN3Jsynopqw1WHvp77s9JHuVA== X-Received: by 10.98.153.11 with SMTP id d11mr24622138pfe.15.1488870840895; Mon, 06 Mar 2017 23:14:00 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:00 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:36 -0800 Message-Id: <20170307071349.16444-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 Subject: [oe] [meta-oe][PATCH 01/14] t1lib: Fix printf format string errors 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 --- .../t1lib/t1lib-5.1.2/format_security.patch | 41 ++++++++++++++++++++++ meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch new file mode 100644 index 000000000..8b4ce400f --- /dev/null +++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch @@ -0,0 +1,41 @@ +Fix printf formats to use format qualifiers +fixes + +error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +--- a/lib/type1/objects.c ++++ b/lib/type1/objects.c +@@ -957,7 +957,7 @@ + + sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", + name, TypeFmt(expect), TypeFmt(obj->type)); +- IfTrace0(TRUE,typemsg); ++ IfTrace1(TRUE, "%s", typemsg); + + ObjectPostMortem(obj); + +--- a/lib/t1lib/t1subset.c ++++ b/lib/t1lib/t1subset.c +@@ -759,7 +759,7 @@ + tr_len); + T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, + T1LOG_DEBUG); +- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */ ++ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */ + } + + /* compute size of output file */ +--- a/lib/type1/objects.h ++++ b/lib/type1/objects.h +@@ -214,7 +214,7 @@ + /*SHARED*/ + /* NDW: personally, I want to see status and error messages! */ + #define IfTrace0(condition,model) \ +- {if (condition) printf(model);} ++ {if (condition) fputs(model,stdout);} + #define IfTrace1(condition,model,arg0) \ + {if (condition) printf(model,arg0);} + #define IfTrace2(condition,model,arg0,arg1) \ diff --git a/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb index 1d670a7d7..826dbda85 100644 --- a/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb +++ b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb @@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \ SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ file://configure.patch \ - file://libtool.patch" + file://libtool.patch \ + file://format_security.patch" SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c" SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59" From patchwork Tue Mar 7 07:13:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94936 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765017qgd; Mon, 6 Mar 2017 23:14:12 -0800 (PST) X-Received: by 10.99.171.5 with SMTP id p5mr25292304pgf.182.1488870852775; Mon, 06 Mar 2017 23:14:12 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m2si21590189pge.34.2017.03.06.23.14.12; Mon, 06 Mar 2017 23:14:12 -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; 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 5D2F771A82; Tue, 7 Mar 2017 07:14:03 +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 626F773288 for ; Tue, 7 Mar 2017 07:14:00 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id o126so6046962pfb.1 for ; Mon, 06 Mar 2017 23:14:02 -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=4+4n/KXxpFNV4fNgdxLefEQGvfP54u8VzZGCHeIqT20=; b=q9Eyvl+DlPLPXLPql5NMxFl4h6Rdb0a10J1cLVjmp0Ibwfva6WjzQeROajt3ucHNml a6Svze/+F6+V0KaiELmNDOjrL+eUmPnUyjvPqYVzE7yJGYIzigXouFjT/58xFJaSrA2r HqGSpve2K80UrF9UjxA1DKdaAckS0u/V4RDKZd4rIC9BOxeHnFqTTTq1K+IOZMsD6rGH Fm5Rr7w0bXE5PS0ZaKq7q0X7SsCLqW17+B8b99jpvPGi8fJPAtfiUeNfoYrtgeOjoSqx Ih9MtXH403FnOmg7ZkehsCvkOY9MdK03TywJpBrZTjpRUjnSyvvwaJrZ5AJc/+RY3NrI AP4Q== 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=4+4n/KXxpFNV4fNgdxLefEQGvfP54u8VzZGCHeIqT20=; b=LdVgGdikiYOggHdEBZD+cevKO36JhgFgztO2Nv3hbHucAznYVMSrDeo5ow43Jxw/8l 9FFKgQNBGhv1WxKriXJfsJLs0NmGkVqYbPdHWs5Vka4otVXwamixM8X0ZoaKhWjVj6gV hHmSKK41MBylhdbLvs1Sp37a+kNGhXqTiNb6TgOrgZBVD2HxONorfNNOZ1l6Zf36vT2w Waq73mWE1rK9cXJw6Av3ifas8Dr3WbDF7h70oxTQVA7yDt2Yp3GAnXWG9stwVQmfubvk B60Etw/eELR6lD4uX+WCiwk9FASL8K0Y3hLLsF460O+EsOkMPq/tJAEZcD0ov8MtRQui 8T5Q== X-Gm-Message-State: AMke39l9jLaY60muf8uoMnkTQftRhSk7YKLa75rJbaJPx6MXNVqaIIB0c/jRExxkaBX1Bw== X-Received: by 10.98.212.81 with SMTP id u17mr26658703pfl.75.1488870841754; Mon, 06 Mar 2017 23:14:01 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:01 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:37 -0800 Message-Id: <20170307071349.16444-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 02/14] fftw: Update to 3.3.6 release 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 --- meta-oe/recipes-support/fftw/{fftw_3.3.5.bb => fftw_3.3.6.bb} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/fftw/{fftw_3.3.5.bb => fftw_3.3.6.bb} (89%) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.5.bb b/meta-oe/recipes-support/fftw/fftw_3.3.6.bb similarity index 89% rename from meta-oe/recipes-support/fftw/fftw_3.3.5.bb rename to meta-oe/recipes-support/fftw/fftw_3.3.6.bb index 71adb8905..559985169 100644 --- a/meta-oe/recipes-support/fftw/fftw_3.3.5.bb +++ b/meta-oe/recipes-support/fftw/fftw_3.3.6.bb @@ -4,11 +4,13 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SRC_URI = " \ - http://www.fftw.org/fftw-${PV}.tar.gz \ + http://www.fftw.org/fftw-${PV}-pl1.tar.gz \ file://0001-NEON-autodetection-segfaults-assume-neon-present.patch \ " -SRC_URI[md5sum] = "6cc08a3b9c7ee06fdd5b9eb02e06f569" -SRC_URI[sha256sum] = "8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf" +SRC_URI[md5sum] = "682a0e78d6966ca37c7446d4ab4cc2a1" +SRC_URI[sha256sum] = "1ef4aa8427d9785839bc767f3eb6a84fcb5e9a37c31ed77a04e7e047519a183d" + +S = "${WORKDIR}/fftw-${PV}-pl1" inherit autotools pkgconfig From patchwork Tue Mar 7 07:13:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94938 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765268qgd; Mon, 6 Mar 2017 23:15:03 -0800 (PST) X-Received: by 10.84.138.1 with SMTP id 1mr32911061plo.29.1488870903765; Mon, 06 Mar 2017 23:15:03 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b64si21608323pgc.0.2017.03.06.23.15.03; Mon, 06 Mar 2017 23:15:03 -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; 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 B47FB775CB; Tue, 7 Mar 2017 07:14:55 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 9DCCE771E8 for ; Tue, 7 Mar 2017 07:14:01 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id 67so15765170pfg.2 for ; Mon, 06 Mar 2017 23:14:03 -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=6nfJe9+Vu1zwkpAx7vzeiNKM4N6sfcL6EOHqHwPyFtc=; b=nY5GUAGXtpO9EbIS+pSsB20cgdKS/yrtJ22Ktj4/nDh6nhDPk0Nr84mfJmWY4kZgSN n7ZrHiT7+tfD8oJdw7joQVtuAZMi4AfP0UC8lCWwuIsCv5R9J5LUYZcVps8XDELtmNbE zb62w/CW9UcwFSkkfcKib0nUWXZzFgs5bYgksOLDrgrrxJC1HKOGD23yBuyIjErES+AD aLHmWE5LxvS3+HKAQ/RejsPccC3wmHroxq9Z9LDDFFylsato8zeOsCFpKPc2QnhN0ovb ObQpJuRCZqHE868tDcHVUcT/7YED112LpcwZq3zA27gZnqf5W3UhLNBVmdq587gvMi6c qqEg== 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=6nfJe9+Vu1zwkpAx7vzeiNKM4N6sfcL6EOHqHwPyFtc=; b=jcmhqdPVsflOufRoIN4NrFaCPZTySpapiCRdvWHu5YK1WovobdVRZD2xJYUVcRu3Ne UQrj981ks1GtaryPlw8FEssAZ7mR/tR8fS/hUSlgCv7fK2OlwdeXKoAfXX1/FpBNXIoE zp0vH5C71AyDCRGGutD68laAVomHDq5qIkmbgg+ywP7tcTB0Po0FD3hoP0v91x83OyjD HNu0PYLLcTlTIpmYGc7uYPER3m8oV/7tluV+oWABbZHWZNNkCOSh6MTG5YHnV6Gi8IEL Aa8TETd8Fnd1eVQHN/uP0wKYIi0X44iYBWr2UcdghB+r1JM5wDi1XgFJERaBrd+RdViz PQfA== X-Gm-Message-State: AMke39lFN4uWLLQJzTdvL1uDz6Y5NX14FSGJefi9v+Qa16yhNE/0vf1stSqwS3SRE5+eeQ== X-Received: by 10.98.104.4 with SMTP id d4mr26547191pfc.2.1488870842591; Mon, 06 Mar 2017 23:14:02 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:02 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:38 -0800 Message-Id: <20170307071349.16444-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 03/14] libxml++: Update to 2.40.1 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 Fix ptests for S != B case Signed-off-by: Khem Raj --- .../libxml/libxml++/libxml++_ptest.patch | 34 +++++++++++----------- .../{libxml++_2.38.1.bb => libxml++_2.40.1.bb} | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) rename meta-oe/recipes-core/libxml/{libxml++_2.38.1.bb => libxml++_2.40.1.bb} (84%) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch index 82960f112..0d1a5186a 100644 --- a/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch +++ b/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch @@ -1,21 +1,21 @@ -diff --git a/Makefile.am b/Makefile.am -index d4aadb1..0e36756 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -253,5 +253,8 @@ post-html: docs/index.html - rsync $(rsync_args) -r docs/index.html $$USER,libxmlplusplus@web.sourceforge.net:$(web_path_project) - rsync $(rsync_args) -r examples $$USER,libxmlplusplus@web.sourceforge.net:$(web_path_project) +Index: libxml++-2.40.1/Makefile.am +=================================================================== +--- libxml++-2.40.1.orig/Makefile.am ++++ libxml++-2.40.1/Makefile.am +@@ -24,5 +24,8 @@ dist_noinst_SCRIPTS = autogen.sh + + DISTCLEANFILES = MSVC_Net2010/libxml++/libxml++config.h +install-ptest: + make -C examples install-ptest + # Optional: auto-generate the ChangeLog file from the git log on make dist - include $(top_srcdir)/macros/dist-changelog.am -diff --git a/examples/Makefile.am b/examples/Makefile.am -index d9541ca..c27e088 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS) + include $(top_srcdir)/build/dist-changelog.am +Index: libxml++-2.40.1/examples/Makefile.am +=================================================================== +--- libxml++-2.40.1.orig/examples/Makefile.am ++++ libxml++-2.40.1/examples/Makefile.am +@@ -19,6 +19,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_ AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS) LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) @@ -24,7 +24,7 @@ index d9541ca..c27e088 100644 check_PROGRAMS = \ dom_build/dom_build \ dom_parse_entities/dom_parse_entities \ -@@ -36,6 +38,23 @@ check_PROGRAMS = \ +@@ -37,6 +39,23 @@ check_PROGRAMS = \ schemavalidation/schemavalidation \ textreader/textreader @@ -48,7 +48,7 @@ index d9541ca..c27e088 100644 # Shell scripts that call the example programs. check_SCRIPTS = \ dom_build/make_check.sh \ -@@ -147,10 +166,10 @@ dist_noinst_DATA = \ +@@ -154,10 +173,10 @@ dist_noinst_DATA = \ # file are located in different directories. dom_read_write/make_check.sh: Makefile echo '# Generated and used by "make check"' >$@ @@ -61,7 +61,7 @@ index d9541ca..c27e088 100644 standard_scripts = $(filter-out dom_read_write/make_check.sh,$(check_SCRIPTS)) # All other script files are generated like so: -@@ -162,3 +181,18 @@ $(standard_scripts): Makefile +@@ -169,3 +188,18 @@ $(standard_scripts): Makefile CLEANFILES = \ dom_read_write/example_output.xml \ $(check_SCRIPTS) @@ -77,6 +77,6 @@ index d9541ca..c27e088 100644 + cd $(srcdir) && cp --parents $(dist_noinst_DATA) $(DESTDIR)/examples + cp Makefile $(DESTDIR)/examples + $(MKDIR_P) $(DESTDIR)/macros -+ cp $(srcdir)/../macros/test-driver $(DESTDIR)/macros ++ cp $(top_srcdir)/build/test-driver $(DESTDIR)/macros + sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/examples/Makefile + diff --git a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb similarity index 84% rename from meta-oe/recipes-core/libxml/libxml++_2.38.1.bb rename to meta-oe/recipes-core/libxml/libxml++_2.40.1.bb index 2cb954835..c001c184c 100644 --- a/meta-oe/recipes-core/libxml/libxml++_2.38.1.bb +++ b/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb @@ -11,8 +11,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ file://libxml++_ptest.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "6b16aac575725a9bc0e9d96489e9251f" -SRC_URI[sha256sum] = "882529189b03db6c69925b3f579ab1941feb4f02b5fe2612504ee7e498a4a05f" +SRC_URI[md5sum] = "377a87bea899f2b4ff62df2418c3d8a6" +SRC_URI[sha256sum] = "4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9" DEPENDS = "libxml2 glibmm" From patchwork Tue Mar 7 07:13:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94939 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765323qgd; Mon, 6 Mar 2017 23:15:12 -0800 (PST) X-Received: by 10.84.208.102 with SMTP id f35mr33369572plh.19.1488870912603; Mon, 06 Mar 2017 23:15:12 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id i15si21622263pfj.285.2017.03.06.23.15.12; Mon, 06 Mar 2017 23:15:12 -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; 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 86469774D8; Tue, 7 Mar 2017 07:15:06 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f176.google.com (mail-pf0-f176.google.com [209.85.192.176]) by mail.openembedded.org (Postfix) with ESMTP id A744F71A82 for ; Tue, 7 Mar 2017 07:14:02 +0000 (UTC) Received: by mail-pf0-f176.google.com with SMTP id o126so23947781pfb.3 for ; Mon, 06 Mar 2017 23:14:04 -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=drAavQ1yWUHE5W+x43G0lAfr8cdwEUgnk77wap4yQBY=; b=GMhPcJ4YiE9pxvZZSLOkUhyGoM8xdP0duWLxTAOmiyFaSTI/1SZdbiNGs42op3NDqX pRl0bszfu/Kesf4aJbWBRzLiFKUrCwBTmtglmU2tqOkQnR2OcWlHG7pMxZ1WTTmdpbBy 4umy5hbjdDeBB3koPnsA04MfSsJ/mK6j2VYVrLpCqTYgaEev7+c9vgHWXl3Uw620qiIa 0SgN/wzBCbKyw5aCTob5K1/ojkmsimqwGxt/SmuZgJEKamF24LZ7TsXWmTUE1BCui5jq jI3wSHcme8iHNurffn2RxfY2+8dgb8qfNxHpXbcREzhUg1cBZA2jcLRMnOK3vYaXf4jQ N1ug== 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=drAavQ1yWUHE5W+x43G0lAfr8cdwEUgnk77wap4yQBY=; b=GMR49ir9D4FtJkc12PbHKyWcdFRNjoFghg5555SqmJOJ5vAwfk2hhmgOsemZjRyF0O 3jn1A0Zim5KIn2MC5fcQRSqa8hqBUHMhAVuiJxwq5mWt1wFwHjDg/lg8ZknOn+h1gASG lRi1RhD9vhZagNsindmgkf3F0dU+bbB4DYfsJ0ylLH0kVxnQwLsHCu5+Dyr6y21K6t3J bqaJ3M2HAMhygETc+9fB4YXHhMOdAXHXClPx5gv18Eege4Ai4uKRcKvXc9j78yo0OOiK 7Be1VG8DJQ+xjU8hJhlqNqFUDoVYNMtnVzW88nU6ZT17FfQihGXrdBuO2egBu3+SGGds xbeg== X-Gm-Message-State: AMke39lKqehXz5u3zFCL4MIK9fzlr7DO5+GikvJgnsq3mr6ytYjh26wcPgA2v325C32hRg== X-Received: by 10.98.212.7 with SMTP id a7mr26336156pfh.34.1488870843472; Mon, 06 Mar 2017 23:14:03 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:02 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:39 -0800 Message-Id: <20170307071349.16444-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 04/14] gpm: Update to use git src uri 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 Additional patches are upstream to fix build with gcc6 and clang Add systemd unit file Signed-off-by: Khem Raj --- .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 - .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 --------------------- meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 + .../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0 .../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +- .../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 52 ++-- 7 files changed, 31 insertions(+), 370 deletions(-) delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch create mode 100644 meta-oe/recipes-support/gpm/gpm/gpm.service.in rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/init (100%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/no-docs.patch (93%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/processcreds.patch (100%) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch deleted file mode 100644 index e43bdcb22..000000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: pending - ---- gpm-1.99.7.orig/src/daemon/open_console.c 2008-07-24 12:33:05.000000000 +0200 -+++ gpm-1.99.7/src/daemon/open_console.c 2013-01-10 12:39:47.975461947 +0100 -@@ -23,6 +23,7 @@ - #include /* open and co. */ - #include /* stat() */ - #include /* ioctl() */ -+#include /* major() */ - - /* Linux specific (to be outsourced in gpm2 */ - #include /* for serial console check */ diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch deleted file mode 100644 index d2d6cb8a8..000000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch +++ /dev/null @@ -1,326 +0,0 @@ -Remove nested functions, they are not available in all compilers -e.g. clang will not support them. - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: gpm-1.99.7/src/drivers/summa/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/summa/i.c -+++ gpm-1.99.7/src/drivers/summa/i.c -@@ -36,6 +36,28 @@ extern int summamaxy; - - extern signed char summaid; - -+static void resetsumma(int fd) -+{ -+ write(fd, 0, 1); /* Reset */ -+ usleep(400000); /* wait */ -+} -+ -+static int waitsumma(int fd) -+{ -+ struct timeval timeout; -+ -+ fd_set readfds; -+ -+ int err; -+ -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return (err); -+} -+ - Gpm_Type *I_summa(int fd, unsigned short flags, struct Gpm_Type *type, int argc, - char **argv) - { -@@ -43,24 +65,6 @@ Gpm_Type *I_summa(int fd, unsigned short - flags = argc = 0; /* FIXME: 1.99.13 */ - argv = NULL; - -- void resetsumma() { -- write(fd, 0, 1); /* Reset */ -- usleep(400000); /* wait */ -- } -- int waitsumma() { -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return (err); -- } - int err; - - char buffer[255]; -@@ -91,7 +95,7 @@ Gpm_Type *I_summa(int fd, unsigned short - */ - setspeed(fd, 1200, 9600, 1, - B9600 | CS8 | CREAD | CLOCAL | HUPCL | PARENB | PARODD); -- resetsumma(); -+ resetsumma(fd); - - write(fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE)); - -@@ -103,7 +107,7 @@ Gpm_Type *I_summa(int fd, unsigned short - * read the Summa Firm-ID - */ - write(fd, SS_FIRMID, strlen(SS_FIRMID)); -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - summaid = 10; /* Original Summagraphics */ - read(fd, buffer, 255); /* Read Firm-ID */ -@@ -111,14 +115,14 @@ Gpm_Type *I_summa(int fd, unsigned short - } - - if(summaid < 0) { /* Genius-test */ -- resetsumma(); -+ resetsumma(fd); - write(fd, GEN_MMSERIES, 1); - write(fd, &GEN_MODELL, 1); /* Read modell */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { /* read Genius-ID */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - read(fd, &config, 1); - summaid = (config[0] & 224) >> 5; /* genius tablet-id -@@ -135,14 +139,14 @@ Gpm_Type *I_summa(int fd, unsigned short - * unknown tablet ? - */ - if((summaid < 0) || (summaid == 11)) { -- resetsumma(); -+ resetsumma(fd); - write(fd, SS_BINARY_FMT SS_PROMPT_MODE, 3); - } - - /* - * read tablet size - */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) - read(fd, buffer, sizeof(buffer)); - write(fd, SS_READCONFIG, 1); -Index: gpm-1.99.7/src/drivers/wacom/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/wacom/i.c -+++ gpm-1.99.7/src/drivers/wacom/i.c -@@ -30,10 +30,6 @@ - #include "message.h" /* gpm_report */ - #include "wacom.h" /* wacom */ - --Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -- char **argv) --{ -- - /* wacom graphire tablet */ - #define UD_RESETBAUD "\r$" /* reset baud rate to default (wacom V) */ - /* -@@ -45,83 +41,91 @@ Gpm_Type *I_wacom(int fd, unsigned short - #define UD_COORD "~C\r" /* Request max coordinates */ - #define UD_STOP "\nSP\r" /* stop sending coordinates */ - -- flags = 0; /* FIXME: 1.99.13 */ - -- void reset_wacom() { -- /* -- * Init Wacom communication; this is modified from xf86Wacom.so module -- */ -- /* -- * Set speed to 19200 -- */ -- setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Baudrate Command -- */ -- write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -- usleep(250000); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(75000); -- /* -- * Set speed to 9600bps -- */ -- setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(250000); -- write(fd, UD_STOP, strlen(UD_STOP)); -- usleep(100000); -- } -+static void reset_wacom(int fd) -+{ -+ /* -+ * Init Wacom communication; this is modified from xf86Wacom.so module -+ */ -+ /* -+ * Set speed to 19200 -+ */ -+ setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Baudrate Command -+ */ -+ write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -+ usleep(250000); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(75000); -+ /* -+ * Set speed to 9600bps -+ */ -+ setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(250000); -+ write(fd, UD_STOP, strlen(UD_STOP)); -+ usleep(100000); -+} - -- int wait_wacom() { -- /* -- * Wait up to 200 ms for Data from Tablet. -- * Do not read that data. -- * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -- */ -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return ((err > 0) ? 1 : err); -- } -+static int wait_wacom(int fd) -+{ -+ /* -+ * Wait up to 200 ms for Data from Tablet. -+ * Do not read that data. -+ * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -+ */ -+ struct timeval timeout; - -- char buffer[50], *p; -+ fd_set readfds; - -- int RequestData(char *cmd) { -- int err; -+ int err; - -- /* -- * Send cmd if not null, and get back answer from tablet. -- * Get Data to buffer until full or timeout. -- * Give back 0 for timeout and !0 for buffer full -- */ -- if(cmd) -- write(fd, cmd, strlen(cmd)); -- memset(buffer, 0, sizeof(buffer)); -- p = buffer; -- err = wait_wacom(); -- while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -- p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -- err = wait_wacom(); -- } -- /* -- * return 1 for buffer full -- */ -- return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return ((err > 0) ? 1 : err); -+} -+ -+static int RequestData(int fd, char *cmd, char *buffer) -+{ -+ int err; -+ char *p; -+ /* -+ * Send cmd if not null, and get back answer from tablet. -+ * Get Data to buffer until full or timeout. -+ * Give back 0 for timeout and !0 for buffer full -+ */ -+ if(cmd) -+ write(fd, cmd, strlen(cmd)); -+ memset(buffer, 0, sizeof(buffer)); -+ p = buffer; -+ err = wait_wacom(fd); -+ while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -+ p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -+ err = wait_wacom(fd); - } -+ /* -+ * return 1 for buffer full -+ */ -+ return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+} -+ -+Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -+ char **argv) -+{ -+ -+ flags = 0; /* FIXME: 1.99.13 */ -+ -+ char buffer[50]; - - /* - * We do both modes, relative and absolute, with the same function. -@@ -143,17 +147,17 @@ Gpm_Type *I_wacom(int fd, unsigned short - }; - parse_argv(optioninfo, argc, argv); - type->absolute = WacomAbsoluteWanted; -- reset_wacom(); -+ reset_wacom(fd); - - /* - * "Flush" input queque - */ -- while(RequestData(NULL)) ; -+ while(RequestData(fd, NULL, buffer)) ; - - /* - * read WACOM-ID - */ -- RequestData(UD_FIRMID); -+ RequestData(fd, UD_FIRMID, buffer); - - /* - * Search for matching modell -@@ -180,7 +184,7 @@ Gpm_Type *I_wacom(int fd, unsigned short - * read Wacom max size - */ - if(WacomModell != (-1) && (!wcmodell[WacomModell].maxX)) { -- RequestData(UD_COORD); -+ RequestData(fd, UD_COORD, buffer); - sscanf(buffer + 2, "%d,%d", &wmaxx, &wmaxy); - wmaxx = (wmaxx - wcmodell[WacomModell].border); - wmaxy = (wmaxy - wcmodell[WacomModell].border); diff --git a/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-oe/recipes-support/gpm/gpm/gpm.service.in new file mode 100644 index 000000000..ee6c040fa --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm/gpm.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Virtual console mouse server + +[Service] +Type=forking +ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/init b/meta-oe/recipes-support/gpm/gpm/init similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/init rename to meta-oe/recipes-support/gpm/gpm/init diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch b/meta-oe/recipes-support/gpm/gpm/no-docs.patch similarity index 93% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch rename to meta-oe/recipes-support/gpm/gpm/no-docs.patch index f10217a94..3faef84ee 100644 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch +++ b/meta-oe/recipes-support/gpm/gpm/no-docs.patch @@ -11,7 +11,7 @@ Index: gpm-1.99.7/Makefile.in # user-overridable flags, but it's also all the implicit rule looks at. # missing ? --SUBDIRS = src doc contrib gpm2 +-SUBDIRS = src doc contrib +SUBDIRS = src diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch rename to meta-oe/recipes-support/gpm/gpm/processcreds.patch diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb index bbb8c28ac..7697772ca 100644 --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb +++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb @@ -5,49 +5,39 @@ SECTION = "console/utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f" +PV .="+git${SRCREV}" PR = "r2" DEPENDS = "ncurses" -SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ +SRC_URI = "git://github.com/telmich/gpm;protocol=git;branch=master \ file://no-docs.patch \ file://processcreds.patch \ - file://eglibc-2.17.patch \ - file://remove_nested_functions.patch \ file://init" -inherit autotools-brokensep update-rc.d +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" +S = "${WORKDIR}/git" + +inherit autotools-brokensep update-rc.d systemd INITSCRIPT_NAME = "gpm" INITSCRIPT_PARAMS = "defaults" -#export LIBS = "-lm" - -# all fields are /* FIXME: gpm 1.99.13 */ -# gpm-1.99.7/src/lib/libhigh.c:171:43: error: parameter 'clientdata' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:21: error: parameter 'line' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:33: error: parameter 'file' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:23: error: parameter 'fd' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:42: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/etouch/i.c:34:43: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/msc/r.c:32:12: error: variable 'dy' set but not used [-Werror=unused-but-set-variable] -# gpm-1.99.7/src/drivers/msc/r.c:32:8: error: variable 'dx' set but not used [-Werror=unused-but-set-variable] -# cc1: all warnings being treated as errors -CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable" - -# twiddler is WIP in 1.99.7 and probably not worth fixing (a lot of changes in gpm-2-dev after 1.99.7 -# gpm-1.99.7/src/drivers/twid/twiddler.c:503:14: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] -# /gpm-1.99.7/src/mice.c:221:5: error: (near initialization for 'mice[32].init') [-Werror] -CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -m 0644 src/headers/gpm.h ${D}${includedir} - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm - cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1 +do_configure_prepend() { + (cd ${S};./autogen.sh;cd -) +} + +do_install_append () { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm + fi + install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h } -SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544" -SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee" + +SYSTEMD_SERVICE_${PN} = "gpm.service" FILES_${PN} += "${datadir}/emacs" From patchwork Tue Mar 7 07:13:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94940 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765359qgd; Mon, 6 Mar 2017 23:15:22 -0800 (PST) X-Received: by 10.99.51.76 with SMTP id z73mr25742742pgz.137.1488870922032; Mon, 06 Mar 2017 23:15:22 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x15si21520553pgo.355.2017.03.06.23.15.21; Mon, 06 Mar 2017 23:15:22 -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; 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 9C65B775EB; Tue, 7 Mar 2017 07:15:07 +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 77276773E3 for ; Tue, 7 Mar 2017 07:14:02 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id 77so9356747pgc.0 for ; Mon, 06 Mar 2017 23:14:04 -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=WhbaD++Wrg9zitIQyeRUyW5DsRw8FkPDH3FrTK9bR0U=; b=ZkOuto/QYEp04aqNw+dY/eVfwJEsFbw727MFZMROcYVP2JKnuzKYGT/9kl0j5f9s1p uRw76AONXO9SskDB3040vgypfAKgur/Y+Iyfl7q3s5jjrBeZZ8ri4P0IPZDTHO2RlUan Wa/AvpJMdN/SFS1DCYgR31orBhqyb6VvTEhUcyXUD6chRi5g8nP2BBoMMoX+Zt1AuxY1 iZaBUpEUw1rCmaKhMHQ5/Ru184aW5yvbflP41/0J5QxODJaqNJEmeaG/BbpvoMKf1ZKm xBj+PrCSg7BEyRtPemGy2PJUzaDfqWix60BlH5yVLXNORjmmMsERArqqpBlAW9Og2biu SXVQ== 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=WhbaD++Wrg9zitIQyeRUyW5DsRw8FkPDH3FrTK9bR0U=; b=VuBTltMa1ag7cBUQiXDR+okXmID3wA9JCqvp2wjmT8E83g5MoUsksp729KqUPVp3hr AkJEoCEBn6SbYPBmsBEXl3b7oruiEDNKMWApctjvt9PP1YH5FlyRMixMG84Xj6X3L5z0 SQHEWvaGKTNJtJJuSIcufaMQRwjrXFw1/+D5mRJNgTNqcrqAWloYdIcsdrQg7dXJ1Z1I MSynX4ZxHmu5BweX6ivEuGp/rkVhfmd/bpLy6g3UQx24kXbMuDnoxVsW/hmOuGPFY9/h rl3AcfS9Hq1FnH6b/IGm9PQOjqQtZYtCkMHbhcr6S0BFA+Bux+ZDGbNXq30gNsEPPfK5 GtoA== X-Gm-Message-State: AMke39kvJpTYtJufODq81eBrHPxsofKqxuH88GtfB07W/lCGpUBOar+6gY7ze8mC8dqcCQ== X-Received: by 10.98.51.70 with SMTP id z67mr26130223pfz.68.1488870844314; Mon, 06 Mar 2017 23:14:04 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:03 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:40 -0800 Message-Id: <20170307071349.16444-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 05/14] grail: Disable elision warnings for clang 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 Clang warns more, but lets disable them for now ../../grail-3.1.1/src/handle.cpp:65:5: error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move] std::move(UniqueRecognizer(recognizer)); ^ ../../grail-3.1.1/src/handle.cpp:65:5: note: remove std::move call here std::move(UniqueRecognizer(recognizer)); ^~~~~~~~~~ Signed-off-by: Khem Raj --- meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb index 3026744a0..5d9d12515 100644 --- a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb +++ b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ inherit autotools pkgconfig DEPENDS = "frame" - +CXXFLAGS_append_toolchain-clang = " -Wno-pessimizing-move" SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44" SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3" From patchwork Tue Mar 7 07:13:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94941 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765397qgd; Mon, 6 Mar 2017 23:15:31 -0800 (PST) X-Received: by 10.84.210.15 with SMTP id z15mr33248782plh.11.1488870931010; Mon, 06 Mar 2017 23:15:31 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v21si10723489pgi.239.2017.03.06.23.15.30; Mon, 06 Mar 2017 23:15:31 -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; 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 B2AD9775F7; Tue, 7 Mar 2017 07:15:08 +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 7E2BF774E2 for ; Tue, 7 Mar 2017 07:14:03 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 187so8405790pgb.2 for ; Mon, 06 Mar 2017 23:14:05 -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=gGxkuArLh1mzCOiJITuAeza9rQX4PjM6ZtM4GFasOBE=; b=iXdU7WUQ/znS3oQc5+lIDCzQkqQ7tR4EU/Pbcl/yV9hJqKwbfxVR/Rrms++JAA8ARa hSQKSJe8ywyVS3vxgIbNLnZaYJI2yxnduQLfwFVSBFcdhtuvXjwOSCl576s053nMONfL egC5GFF9k8bCyYc8dOX+HoWnAJ4/6jYZcdcG8Nrx/v/yLV2p3NZy5hZTj0K7AhuLpRJ+ YHruJu1L4If9lNcV3e5cFk3K+ZZOtNu/QwKHrSELEeMbPz5FbWYaVUHQ8psC9StsccjC LxlKwt3p0TmSh2DvoRjSInf10TEFxmoW1bjvuqX4z0nKTa0wVaO9tjs7MC406RH84KKI Md0g== 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=gGxkuArLh1mzCOiJITuAeza9rQX4PjM6ZtM4GFasOBE=; b=OHKz+lAWerGkEbB56QEbd6z6ocTtuOsnWA99Leoo1TSSakzIbUYWUHhmidDCNzT5b8 eJOgutlJgPqh31caIhGvav2FBZBhGlkp8l1+AanogluTwBzMGtt4PywdKi+0Qy/XdZY8 HClsDVMyxYTr3wnwSmAU0cgsq381sVP5rSfjbMMCdJcPq4FGa4sWwc133VJinA6uGkcb 6QwINDmvhF4C/WVVwBLSqUvZYMEePdiITJcF16OIgu/upkAdjv6hbyBl/7GfGVU3Ib79 r0YinrvWszCJM5Ym4sPKBniZhaV+ESQUUJJuED5uQJQcU71x/iUcL87MHvKNfydaw7UV E9zw== X-Gm-Message-State: AMke39nCeib6Rq8nuNOPV4ok+4fSp0QiqOpQkFyOMbfwC+F03grMwGMQp74WONY4mVEo/Q== X-Received: by 10.84.192.137 with SMTP id c9mr32937621pld.17.1488870845154; Mon, 06 Mar 2017 23:14:05 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:04 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:41 -0800 Message-Id: <20170307071349.16444-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 06/14] gperftools: Fix build with clang 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-Support-Atomic-ops-on-clang.patch | 33 ++++++++++++++++++++++ .../recipes-support/gperftools/gperftools_2.5.bb | 4 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch new file mode 100644 index 000000000..e582c0da6 --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch @@ -0,0 +1,33 @@ +From ea9f64eb2cdf3be6c4dc65fa1472d854616e43ca Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 Mar 2017 13:38:46 -0800 +Subject: [PATCH] Support Atomic ops on clang + +clang pretends to be gcc 4.2 which is a lie +it actually supports a lot more features then +gcc 4.2, here it depends on gcc 4.7 to enable +the atomics and fails for clang + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/base/atomicops.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/base/atomicops.h b/src/base/atomicops.h +index be038f3..f1a21ff 100644 +--- a/src/base/atomicops.h ++++ b/src/base/atomicops.h +@@ -118,7 +118,7 @@ + #include "base/atomicops-internals-linuxppc.h" + #elif defined(__GNUC__) && defined(__mips__) + #include "base/atomicops-internals-mips.h" +-#elif defined(__GNUC__) && GCC_VERSION >= 40700 ++#elif defined(__GNUC__) && GCC_VERSION >= 40700 || defined(__clang__) + #include "base/atomicops-internals-gcc.h" + #else + #error You need to implement atomic operations for this architecture +-- +2.12.0 + diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.5.bb b/meta-oe/recipes-support/gperftools/gperftools_2.5.bb index 2e4479c9d..3cab42385 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.5.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.5.bb @@ -4,7 +4,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" DEPENDS = "libunwind" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/gperftools/gperftools-2.5.tar.gz/aa1eaf95dbe2c9828d0bd3a00f770f50/gperftools-2.5.tar.gz" +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/gperftools/gperftools-2.5.tar.gz/aa1eaf95dbe2c9828d0bd3a00f770f50/gperftools-2.5.tar.gz \ + file://0001-Support-Atomic-ops-on-clang.patch\ + " SRC_URI[md5sum] = "aa1eaf95dbe2c9828d0bd3a00f770f50" SRC_URI[sha256sum] = "6fa2748f1acdf44d750253e160cf6e2e72571329b42e563b455bde09e9e85173" From patchwork Tue Mar 7 07:13:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94942 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765440qgd; Mon, 6 Mar 2017 23:15:38 -0800 (PST) X-Received: by 10.98.214.4 with SMTP id r4mr26716038pfg.185.1488870938778; Mon, 06 Mar 2017 23:15:38 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 68si4090556pga.299.2017.03.06.23.15.38; Mon, 06 Mar 2017 23:15:38 -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; 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 CAC7277600; Tue, 7 Mar 2017 07:15:09 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 636FD774FD for ; Tue, 7 Mar 2017 07:14:04 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id 67so15765339pfg.2 for ; Mon, 06 Mar 2017 23:14:06 -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=0GoV8PnW2L9pitFUNpYBwQPRTA9iCiaLdkrnVPQw0uo=; b=LrlTzDVoSvshNW2xhx0R44vZycfHEhYtTKCRylMpZq2FZoBnhIscDfvRZ7B42YXBeK aL1ptqnWs8g8Bk949ETOMOJi4RwbAvOzkUV/KcXhNlGTdNOr/30sCTELLdh325dmhKMt FSHNnKHXZAvXeHFnDKSFQ+Whuxb/EYsQ7HSwWEMCHDkj6ICc5vJxMyL2qhm6jUTbWeau Stl4qYtfHlc6x81ukq2t7N8GgYFMmpC2l2fRpkfRU3JRNJIu99Q0uApbCdf+qlQm2WfF ODpIPFl0VG1ntkFO1DDL+q4MaxM0Q/ZMtVk64uDYLjBaewsJdPuGv3xfbPNYpvCcNQX9 RyxQ== 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=0GoV8PnW2L9pitFUNpYBwQPRTA9iCiaLdkrnVPQw0uo=; b=bSny5RUf0GEgbrrLXkcmc5Y3fnXTJv6ronM7MpKm4rxK/6CvPWt+U28QNyfLDsl9Yd BZy58AtjW7FIRYl/ZIZKIVZmZ6SJ8zox7gVOCrmQjWMjfKyQ2Zjvzx8uzX+u+H0pHC5z NwwjtvIhRx2FDxJD+ieSpHhdCKvNkIcthPeqHs0bFsKC8Hxs9fE4i2jSvYZ+/zg5XQ9C 0TvvIyMf1lNZTR/qITZK3KKVgMBFDOFwbjP3E5k1J0PU5nlLxYWUVGYD3GDygxWF0to6 xLlnj6JzpVU/9jBFz1k6fz4HxYmpAKb2wY5yNqdCsNMJcOhlQrHHZ6Ff1+iVHwGikVbx 7Awg== X-Gm-Message-State: AMke39nRw36OpxkcyFBhdWbBD/3bBRyqDulzrlC8a3QPopzIhYmFv/F7dpeAv6wRxhi5Zw== X-Received: by 10.99.206.5 with SMTP id y5mr25568288pgf.212.1488870845998; Mon, 06 Mar 2017 23:14:05 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:05 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:42 -0800 Message-Id: <20170307071349.16444-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 07/14] tbb: Update to 2017 release 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 Update license to reflect new Apache 2.0 license Fix build with clang Signed-off-by: Khem Raj --- meta-oe/recipes-support/tbb/{tbb_4.1.bb => tbb.bb} | 23 ++++++++--------- .../tbb/allow-to-build-for-older-arm-cores.patch | 30 ---------------------- .../recipes-support/tbb/tbb/cross-compile.patch | 30 ++++++++++++++++------ 3 files changed, 33 insertions(+), 50 deletions(-) rename meta-oe/recipes-support/tbb/{tbb_4.1.bb => tbb.bb} (74%) delete mode 100644 meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/tbb/tbb_4.1.bb b/meta-oe/recipes-support/tbb/tbb.bb similarity index 74% rename from meta-oe/recipes-support/tbb/tbb_4.1.bb rename to meta-oe/recipes-support/tbb/tbb.bb index 09ed6ec52..d8eb1c2f3 100644 --- a/meta-oe/recipes-support/tbb/tbb_4.1.bb +++ b/meta-oe/recipes-support/tbb/tbb.bb @@ -4,23 +4,22 @@ DESCRIPTION = "Parallelism library for C++ - runtime files \ higher-level, task-based parallelism that abstracts platform details \ and threading mechanism for performance and scalability." HOMEPAGE = "http://threadingbuildingblocks.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=2c7f2caf277a3933e3acdf7f89d54cc1" -PRDATE = "20130314" -PR = "r${PRDATE}" - -SRC_URI = "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_${PRDATE}oss_src.tgz \ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +PRDATE = "20170118" +PV = "${PRDATE}" +SRC_URI = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb2017_${PRDATE}oss_src.tgz \ file://cross-compile.patch \ - file://allow-to-build-for-older-arm-cores.patch \ file://tbb.pc" +SRC_URI[md5sum] = "26baa6fbcc8f03ee45c0641b91d9588a" +SRC_URI[sha256sum] = "48bb526287fa8b4e7d1e1b2ba9e5fb9c3e372b497772c06ef9ccd7f93f344e74" -S = "${WORKDIR}/tbb41_${PRDATE}oss/" - -SRC_URI[md5sum] = "ed4af7ccfa122f16cf9920b241633a3a" -SRC_URI[sha256sum] = "32fd5979971b772caa96d40646cee585ed0070516ba2dbbcb1f9b6033d08a92d" +S = "${WORKDIR}/tbb2017_${PRDATE}oss/" +COMPILER ?= "gcc" +COMPILER_toolchain-clang = "clang" do_compile() { - oe_runmake compiler=gcc arch=${HOST_ARCH} runtime=cc4 + oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} runtime=cc4 } do_install() { diff --git a/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch b/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch deleted file mode 100644 index cd2ec9499..000000000 --- a/meta-oe/recipes-support/tbb/tbb/allow-to-build-for-older-arm-cores.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Marcin Juszkiewicz -Description: Allow to build TBB for ARM cores older than ARMv7a - -| ../../include/tbb/machine/gcc_armv7.h:39:2: error: #error Threading -Building Blocks ARM port requires an ARMv7-a architecture. -| make[1]: *** [concurrent_hash_map.o] Error 1 - -https://bugs.launchpad.net/linaro-oe/+bug/1167144 - -Upstream-status: pending - ---- - include/tbb/tbb_machine.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- tbb41_20130314oss.orig/include/tbb/tbb_machine.h -+++ tbb41_20130314oss/include/tbb/tbb_machine.h -@@ -237,11 +237,11 @@ template<> struct atomic_selector<8> { - #include "machine/linux_intel64.h" - #elif __ia64__ - #include "machine/linux_ia64.h" - #elif __powerpc__ - #include "machine/mac_ppc.h" -- #elif __arm__ -+ #elif __ARM_ARCH_7A__ - #include "machine/gcc_armv7.h" - #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT - #include "machine/gcc_generic.h" - #endif - #include "machine/linux_common.h" diff --git a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch index b970a374e..d54b307ee 100644 --- a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch +++ b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch @@ -5,14 +5,14 @@ Upstream-Status: unsuitable build/linux.gcc.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---- tbb41_20121003oss.orig/build/linux.gcc.inc -+++ tbb41_20121003oss/build/linux.gcc.inc -@@ -40,12 +40,13 @@ DYLIB_KEY = -shared +Index: tbb2017_20170118oss/build/linux.gcc.inc +=================================================================== +--- tbb2017_20170118oss.orig/build/linux.gcc.inc ++++ tbb2017_20170118oss/build/linux.gcc.inc +@@ -32,8 +32,9 @@ DYLIB_KEY = -shared EXPORT_KEY = -Wl,--version-script, LIBDL = -ldl - TBB_NOSTRICT = 1 - -CPLUS = g++ -CONLY = gcc +CPLUS = $(CXX) @@ -20,6 +20,20 @@ Upstream-Status: unsuitable +CPLUS_FLAGS = $(CXXFLAGS) LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) LIBS += -lpthread -lrt - LINK_FLAGS = -Wl,-rpath-link=. - C_FLAGS = $(CPLUS_FLAGS) - # gcc 4.4 and higher support -std=c++0x + LINK_FLAGS = -Wl,-rpath-link=. -rdynamic +Index: tbb2017_20170118oss/build/linux.clang.inc +=================================================================== +--- tbb2017_20170118oss.orig/build/linux.clang.inc ++++ tbb2017_20170118oss/build/linux.clang.inc +@@ -31,8 +31,9 @@ DYLIB_KEY = -shared + EXPORT_KEY = -Wl,--version-script, + LIBDL = -ldl + +-CPLUS = clang++ +-CONLY = clang ++CPLUS = $(CXX) ++CONLY = $(CC) ++CPLUS_FLAGS = $(CXXFLAGS) + LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) + LIBS += -lpthread -lrt + LINK_FLAGS = -Wl,-rpath-link=. -rdynamic From patchwork Tue Mar 7 07:13:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94943 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765473qgd; Mon, 6 Mar 2017 23:15:46 -0800 (PST) X-Received: by 10.84.231.9 with SMTP id f9mr26842867plk.117.1488870946474; Mon, 06 Mar 2017 23:15:46 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f1si21615764pld.302.2017.03.06.23.15.46; Mon, 06 Mar 2017 23:15:46 -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; 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 DAE227760D; Tue, 7 Mar 2017 07:15:10 +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 D1AC173109 for ; Tue, 7 Mar 2017 07:14:05 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id b5so5269508pgg.1 for ; Mon, 06 Mar 2017 23:14:07 -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=u7s4pNhL89OY/+xQ0OY7SYU3FZ12RRJwScyQzhozp8Y=; b=MaZ3ptO6cKdg6oCuYJaQg+VJIdWzYlcyyV2cIhYKugq+dCgLC1Uv6xWOYe8kojhigX D+ko/W8TKLMQQSOPBmfA2Go+KB7/JGUNFe2jnTVbdQBDy14CQemUXSPXDEdKognrHgNg Ds9L5jM06wmyUO4bfCdiBpL8yZ8d6B/NRYohpUSqheodQMBOd4wrZCEOeWjf/PuzDef4 LwtbC2xk24P9X622wVBAtPrMAFg2xH/1Ysc3XEiIdiBhUtsRj23wd1DjL/o4oyKVqMch bP9vgCU3OM4Dqzk9wZTCP3eLlsS5LmoNRsLuO/SdhZeNQk8u7K5Gh3/ig/OqyrtTt8IZ vDGg== 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=u7s4pNhL89OY/+xQ0OY7SYU3FZ12RRJwScyQzhozp8Y=; b=bNlLwnqyb5W8I8n9lVZUwIbIW3xna9p4xso2RylRr+IWr1Zl7jHDXnbdCUfiS9RAit 5w1YW5A0n/udHIz341FGwmhzm+FPG5AlSMkxnpN6hJ6Eg0Mqxaeri/z1B8P0DLo2x5E7 xR1SKPnA8tgYG0YBo5ezsDIIr4mV7JDxa9TwSx+87sblWg9q24xhoRotwaH4ByS1OK0d rZqVxZ6KTGMFUJir+LvHZFWQ99ZxAj/CCjNv3rsunSd4gSQfMwO/HE9vu55C3kmFKWwX 1veHF+FYa52zugaUeIgv5lt6KbLNHs9FdU0b6yPRuVrjj4AqJcImcPbywN1duEX/JYPj /Z6g== X-Gm-Message-State: AMke39mVOKf2dV3McEZcSAU1LQBOHNL25ej1HffDlcmlEgIWJLGtoG7Dkf6JaHhRD66cxA== X-Received: by 10.84.129.195 with SMTP id b61mr32779716plb.83.1488870846840; Mon, 06 Mar 2017 23:14:06 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:06 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:43 -0800 Message-Id: <20170307071349.16444-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 08/14] irssi: Upgrade to 1.0.1 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 --- .../recipes-connectivity/irssi/irssi_0.8.16-rc1.bb | 22 ---------------------- meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb create mode 100644 meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb b/meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb deleted file mode 100644 index 54d881d1c..000000000 --- a/meta-oe/recipes-connectivity/irssi/irssi_0.8.16-rc1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "ncurses IRC client" -DESCRIPTION = "Irssi is an ncurses IRC client" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" - -DEPENDS = "glib-2.0 ncurses openssl" - -REALPV = "0.8.16-rc1" -PV = "0.8.15+${REALPV}" - -SRC_URI = "http://irssi.org/files/irssi-${REALPV}.tar.gz" - -SRC_URI[md5sum] = "769fec4df8e633c583c411ccd2cd563a" -SRC_URI[sha256sum] = "bb6c0125db30b697f80837941c17372b7484c64d57a6920b8bfa7ee3def92de3" - -S = "${WORKDIR}/irssi-${REALPV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-ssl \ - --with-ncurses=${STAGING_EXECPREFIXDIR} \ -" diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb new file mode 100644 index 000000000..041f5de6d --- /dev/null +++ b/meta-oe/recipes-connectivity/irssi/irssi_1.0.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "ncurses IRC client" +DESCRIPTION = "Irssi is an ncurses IRC client" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" + +DEPENDS = "glib-2.0 ncurses openssl" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI[md5sum] = "f6bed196cef63ea089f5cce089784445" +SRC_URI[sha256sum] = "9428c51a3f3598ffaef438c351a8d609cf10db34f2435bdcb84456226c383ccf" + +inherit autotools pkgconfig From patchwork Tue Mar 7 07:13:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94944 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765510qgd; Mon, 6 Mar 2017 23:15:54 -0800 (PST) X-Received: by 10.84.216.15 with SMTP id m15mr33447869pli.22.1488870954600; Mon, 06 Mar 2017 23:15:54 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f24si21669094pfj.22.2017.03.06.23.15.54; Mon, 06 Mar 2017 23:15: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; 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 24BB777621; Tue, 7 Mar 2017 07:15:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id AC495771E8 for ; Tue, 7 Mar 2017 07:14:06 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id 67so15765429pfg.2 for ; Mon, 06 Mar 2017 23:14:08 -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=Yf6VC7+uzDJ7RtMmKSstRjjLJARQ7DNVp9o4IlBHxAY=; b=jpkTdFsqIrIyfXoMJqXkJpR4qYjuOaOGPfNHLILRZA9NpjnFAG0M0r3e2flW5LZadp DwvMCs0vka8haRKzx7duMGOADN4soNYG2Rizz1c2kHnFLF/3VWkV6L127dYn6GRTyzI6 Y6slbqgvJp93acRHvVdbNuF6PmOUSOl2M/jAerAEUnYVpPY99zcOpbDwDl1bY/tMN3Ru igfCWnox3I3aeYm1VlEEeOJ1EPegJRV0VL0zH8Vx9+XqcEImGRZVAA9qZToOYZm2WcBj +mA0WX6L71Uqy3QZrwNHpyNWgIHsjyQTkBsMWlpEXGlEOWN0qRLcljfRj7127tZAL08T AffA== 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=Yf6VC7+uzDJ7RtMmKSstRjjLJARQ7DNVp9o4IlBHxAY=; b=A8bj5LusZTbTxou0ZQZX1VYaxBtcr6bF3o6VLZcFtins2n8I0b+gKAaEGs12GRfJ1B qucLW+EGV/2jfTc3PsNQbeobXSVpXVOC6cts3doiaVmxhIcS/sCZRTHNyN9zAp0bD6us w7u5sLopXNdZYv3mEbd3ocsvgk36IE/VCTaHrLFmgrGqNeRIDplGeO61aV69OAuABG9E oSYRUTGR3rM6AOkIEB2Y7CzpTOG9JkdylBBEkeE+/z/S64FbvJf8/I3JUd5qu/ERCPMA 2+iMrngs00oayaxC0qVVVeszvELq4ZryVEMkbX9YpxqRLN0QaDhQ7dDNw525cNsXJU4r Gk6Q== X-Gm-Message-State: AMke39mjICndqTRVFFfV0sv3NseCiBakbl9fGIMty3zvelyrcHoRXWruvy0cBIEICw1UgA== X-Received: by 10.99.45.133 with SMTP id t127mr25884126pgt.224.1488870847792; Mon, 06 Mar 2017 23:14:07 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:07 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:44 -0800 Message-Id: <20170307071349.16444-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 09/14] a2jmidid: Fix build on aarch64 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 --- .../jack/a2jmidid/0002-aarch64.patch | 31 ++++++++++++++++++++++ meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch b/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch new file mode 100644 index 000000000..b344f5427 --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch @@ -0,0 +1,31 @@ +Consider compiler define for aarch64 + +Signed-off-by: Khem Raj +Upstream-Status:Pending + +Index: a2jmidid-8/sigsegv.c +=================================================================== +--- a2jmidid-8.orig/sigsegv.c ++++ a2jmidid-8/sigsegv.c +@@ -91,18 +91,18 @@ static void signal_segv(int signum, sigi + a2j_error("info.si_errno = %d", info->si_errno); + a2j_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]); + a2j_error("info.si_addr = %p", info->si_addr); +-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) ++#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) + for(i = 0; i < NGREG; i++) + a2j_error("reg[%02d] = 0x" REGFORMAT, i, + #if defined(__powerpc__) + ucontext->uc_mcontext.uc_regs[i] +-#elif defined(__sparc__) && defined(__arch64__) ++#elif defined(__sparc__) || defined(__arch64__) + ucontext->uc_mcontext.mc_gregs[i] + #else + ucontext->uc_mcontext.gregs[i] + #endif + ); +-#endif /* alpha, ia64, kFreeBSD, arm, hppa */ ++#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */ + + #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) + # if defined(SIGSEGV_STACK_IA64) diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb index 0204fb904..a520f98e1 100644 --- a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +++ b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb @@ -11,6 +11,7 @@ DEPENDS = "alsa-lib jack dbus" SRC_URI = " \ http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch \ + file://0002-aarch64.patch \ " SRC_URI[md5sum] = "9cf4edbc3ad2ddeeaf6c8c1791ff3ddd" SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f" From patchwork Tue Mar 7 07:13:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94945 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765547qgd; Mon, 6 Mar 2017 23:16:02 -0800 (PST) X-Received: by 10.99.209.85 with SMTP id c21mr24928642pgj.147.1488870962241; Mon, 06 Mar 2017 23:16:02 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c16si21629469plk.123.2017.03.06.23.16.01; Mon, 06 Mar 2017 23:16:02 -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; 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 39DC777629; Tue, 7 Mar 2017 07:15:13 +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 17D377756E for ; Tue, 7 Mar 2017 07:14:07 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id b5so5269578pgg.1 for ; Mon, 06 Mar 2017 23:14:08 -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=Y9lkC5pi4fd1b2csE8Eymwny3Ge9zhTzmpobYrH1Sgo=; b=Ag3ommfvvPB/sZqLGmZvBkVEmaGBAU6hvJnKz+QLKEWoXWTMLyytjst7fQA2a/FdL1 zAMwqitWRNh6V27PqX/J7MlOD1O+cFuR7HFb+U4yqh8zOeHPdfelLRNOJ64zBX/blkiW eY5fNoKhQzIPhBunoaHVS/cXeyLbBkLIlgTDp8PYVq9D3SjXeSAHEqY6Y3ILCfOFw43z ftmg4GukzD3KEsWX5PwLlrZhNp4gYMRhqr6BQQLxsQ/9JnAFOK9PGXhXGI7J3kdnXRVo mXdMLz3tLcB00WfnrwvftTNwhtayTmLTFxMRXgCYwgNFvRDXVuvEnU7W0lu6Bim0J1F7 BuTg== 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=Y9lkC5pi4fd1b2csE8Eymwny3Ge9zhTzmpobYrH1Sgo=; b=MoWhZ1LY6+Doqhij/RFOA397CPc3i4eC2UQNg7LXsdlSUKbEjRTdwe+1W+APoOrHKu 3P1zXv1zlZj5wEZejODa5KGBT2yo5ihR0KSZdbdIVQhUK0umDCZ4T2loweAoiygjMzC1 HUUbut/lwa/NzZPO5+SIlYBDXZcz9q5S8o5lMDE1sqc/oYdGpdnmbwoMZB+LlRuAbCxE SZVjsg0lxfhcshCLRdJ2JdPm4Qn/7CjRmYSnJ3wlujwWyOXC+jxuuNhDWkBmF7aKJ4p4 T4G4+8LO1LFCwQhAB3IZF20RlqjZjGS1i+fyqtu3Bsn8tmyjULX3507RzfL7ygGLJw/B kRSA== X-Gm-Message-State: AMke39kqIY226wbOBFG6vnjDcIZ6FLwveHT04GjCkxYOwHXEKTwjqeKHfzerDevUrY1mXA== X-Received: by 10.84.177.36 with SMTP id w33mr32847270plb.105.1488870848751; Mon, 06 Mar 2017 23:14:08 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:08 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:45 -0800 Message-Id: <20170307071349.16444-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 10/14] log4c: Backport patch to fix security format errors with clang 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 --- ...-properly-in-the-example-format-security-.patch | 26 ++++++++++++++++++++++ meta-oe/recipes-support/log4c/log4c_1.2.4.bb | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch new file mode 100644 index 000000000..9ff9d7002 --- /dev/null +++ b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch @@ -0,0 +1,26 @@ +From 97f0b7b25474fab25f5757f7c50a77e20be5d05b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= +Date: Mon, 7 Sep 2015 15:00:48 +0200 +Subject: [PATCH] Use the API properly in the example (format security error + fixed). + +--- + examples/helloworld1/mylog.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/helloworld1/mylog.h b/examples/helloworld1/mylog.h +index 280f3dc..57e5369 100644 +--- a/examples/helloworld1/mylog.h ++++ b/examples/helloworld1/mylog.h +@@ -39,7 +39,7 @@ static LOG4C_INLINE int mylog_fini(){ + + static LOG4C_INLINE void mylog_msg(char *catName,int a_priority, char *msg){ + #ifndef WITHOUT_LOG4C +- log4c_category_log(log4c_category_get(catName), a_priority, msg); ++ log4c_category_log(log4c_category_get(catName), a_priority, "%s", msg); + #else + printf(msg); + #endif +-- +2.12.0 + diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb index a028f2b7f..ef7ad847a 100644 --- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb +++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb @@ -4,7 +4,9 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ - file://fix_configure_with-expat.patch" + file://fix_configure_with-expat.patch \ + file://0001-Use-the-API-properly-in-the-example-format-security-.patch \ + " SRC_URI[md5sum] = "0d94919136e1d16b68427562e74cb3dd" SRC_URI[sha256sum] = "5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea" From patchwork Tue Mar 7 07:13:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94946 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765610qgd; Mon, 6 Mar 2017 23:16:10 -0800 (PST) X-Received: by 10.99.60.76 with SMTP id i12mr25922486pgn.30.1488870970506; Mon, 06 Mar 2017 23:16:10 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f1si21616820pld.302.2017.03.06.23.16.10; Mon, 06 Mar 2017 23:16:10 -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; 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 7908E77639; Tue, 7 Mar 2017 07:15:14 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 72E2773109 for ; Tue, 7 Mar 2017 07:14:08 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 77so9356944pgc.0 for ; Mon, 06 Mar 2017 23:14:09 -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=7UpWB+r5IbwhLwCkoW6uovKGyd3qnGjxeX6SKfxPfcE=; b=KJUejnra54LuD8kyt2I1FKIxG9/fqe7OsmBjQpf01azkdHJqVfpG+Fe1RiUwwx6keD zm/c01YUCm+FOfMNE2GHEFtd14eqnhX+gjtZqkAGeFCnQ/6x7sKEJX9tLxJDh4xE5aIr 0tPmzfda3uUYNod4eKZRZCkuMRpsItOoBTKAZgVntetTlO/ouVkWUVec/u6pi/c1W1c/ TbvlGDhsLWiy0WEmJorHUN97S1bI8U/X93DnfQ7Is8X6qimHYHX5f7FdpdHQY/+tCyOx DyocIwQVCtkITVyT8h2iaH3u2MUNEyvHUWfJnT1gj/v68aVdf7inKzHVHWn/2pMCXyPw ZVxg== 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=7UpWB+r5IbwhLwCkoW6uovKGyd3qnGjxeX6SKfxPfcE=; b=reg8Lxm9T9hXZY+c6zx1JDovJ0kcZ2e/Tntg5QGeAVJn7axtNHjUAbipYz7pXkGY2s PDxlnQ0RzHdCRuYF0gWgMFcXKPLbPm6ygtnGXRIitm2tBOhWHaXMuWdA44TAaTGkmteg S+iZ/9LTpPcP8rfuvylu5VAaq+6BVN8kYvWpONbF79FQ/FoqtdPw7XxYCdrm7EOCrFCd gLldAsvhRhaJe4Mh7Uv/nN/fmv16RUCyMIN5cR05iXhyem9tGCZle/9cbf4MpPVzqQhA pjOnJEAhVaTwn/8dbISOoFRJ0IkMHO+VdPI2BajSYBq3mFZatDjigStriQU97d7HXVTb bedw== X-Gm-Message-State: AMke39kP4C59AbxVyBawoxq5o934vupDwanAeEpdZknJNWIPDpoDf05MiYh9aqhXzerwVQ== X-Received: by 10.84.146.140 with SMTP id g12mr32304702pla.70.1488870849637; Mon, 06 Mar 2017 23:14:09 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:09 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:46 -0800 Message-Id: <20170307071349.16444-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 11/14] rapidjson: Update to 1.1.0 + git 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 Drop backports Adjust the license checksums to match the changes to file especially https://github.com/miloyip/rapidjson/commit/b4b1a39937fbd168ef72ea477f90f626773d56fc Signed-off-by: Khem Raj --- .../Fix-gcc-strict-overflow-warning.patch | 30 ---------------- .../remove-march-native-from-CMAKE_CXX_FLAGS.patch | 41 +++++++++++++--------- .../{rapidjson_1.0.2.bb => rapidjson_1.1.0.bb} | 7 ++-- 3 files changed, 28 insertions(+), 50 deletions(-) delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch rename meta-oe/recipes-devtools/rapidjson/{rapidjson_1.0.2.bb => rapidjson_1.1.0.bb} (74%) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch deleted file mode 100644 index 6ce3933ce..000000000 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f5560d9557ee48fb79810180ddfd3ec386e2a7b5 Mon Sep 17 00:00:00 2001 -From: Milo Yip -Date: Wed, 2 Mar 2016 01:01:17 +0800 -Subject: [PATCH] Fix gcc strict-overflow warning - -Fix #566 #568 - -Upstream-Status: Backport [Partial merge of upstream commit 928caf92e] - -Signed-off-by: Andre McCurdy ---- - include/rapidjson/internal/dtoa.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h -index 2d8d2e4..15571e1 100644 ---- a/include/rapidjson/internal/dtoa.h -+++ b/include/rapidjson/internal/dtoa.h -@@ -148,7 +148,7 @@ inline char* WriteExponent(int K, char* buffer) { - inline char* Prettify(char* buffer, int length, int k) { - const int kk = length + k; // 10^(kk-1) <= v < 10^kk - -- if (length <= kk && kk <= 21) { -+ if (0 <= k && kk <= 21) { - // 1234e7 -> 12340000000 - for (int i = length; i < kk; i++) - buffer[i] = '0'; --- -1.9.1 - diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch index 17164283c..cf3e16ea5 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch @@ -12,22 +12,29 @@ Signed-off-by: Andre McCurdy CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 68139ba..cae7c9b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,9 +26,9 @@ if(RAPIDJSON_HAS_STDSTRING) - endif() +Index: git/CMakeLists.txt +=================================================================== +--- git.orig/CMakeLists.txt ++++ git/CMakeLists.txt +@@ -51,10 +51,10 @@ endif(CCACHE_FOUND) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) - endif() --- -1.9.1 - + if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + else() + #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror") + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion) +@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") + else() + #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers") + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything) diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_1.1.0.bb similarity index 74% rename from meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb rename to meta-oe/recipes-devtools/rapidjson/rapidjson_1.1.0.bb index dd6b89698..402c93921 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_1.1.0.bb @@ -2,14 +2,15 @@ SUMMARY = "A fast JSON parser/generator for C++ with both SAX/DOM style API" HOMEPAGE = "http://rapidjson.org/" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://license.txt;md5=cff54e417a17b4b77465198254970cd2" +LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \ file://remove-march-native-from-CMAKE_CXX_FLAGS.patch \ - file://Fix-gcc-strict-overflow-warning.patch \ " -SRCREV = "3d5848a7cd3367c5cb451c6493165b7745948308" +SRCREV = "ecf3d64293d84666534a23523814df6323c6bfe5" + +PV .= "+git${SRCPV}" S = "${WORKDIR}/git" From patchwork Tue Mar 7 07:13:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94947 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765637qgd; Mon, 6 Mar 2017 23:16:17 -0800 (PST) X-Received: by 10.99.55.25 with SMTP id e25mr25892441pga.15.1488870977391; Mon, 06 Mar 2017 23:16:17 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 1si21563990pgl.232.2017.03.06.23.16.17; Mon, 06 Mar 2017 23:16:17 -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; 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 89B937754B; Tue, 7 Mar 2017 07:15:15 +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 027067756F for ; Tue, 7 Mar 2017 07:14:09 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 77so9357013pgc.0 for ; Mon, 06 Mar 2017 23:14:10 -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=GKbvAhFsNcPfsN7wcjq1vGOyVRU4tPu3tLi6Z+NJwjo=; b=hhBi3YHZPYCT2jmoX3tMvWH9IG6rZsD5DcSsp0Xyy955/QhzxFbP07KD+vrxhArMAE bmn+phl2fsUgbMG/h2KSBkAjOMw+EdVJyMMu1esITtMy41H7pYfki17p7hTv49HL0KNm tYRNeK6n1Kg+T2NCvtC99jzZojGyZO+Jti4FXYeKZdXOhfkeic6e0n/N+rKYJRuGEJzX jGOeWABkdp3JGNrZSpMG2x5aDuk4l1+ADmdT8/Uzx8ZHfVxFE/hgjljg3GAMuhJXMqPi DWa9YstuFzEmUHIEgHRdUsGrGm208u3VCLY+c8+5Spc3pysv/OTLtjbkGTr+7QJm75CY 81ow== 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=GKbvAhFsNcPfsN7wcjq1vGOyVRU4tPu3tLi6Z+NJwjo=; b=a+E13DFH21vldpGCE0vopY2BPGrJYhGuSy/FvbB5nHfCA6/EY1lcdXVBUUukZqnU6W jDHAfaxS/cUvVSmVEnhGg3HQuaxBB7W2O1RNkuH+ZNx2aTBDZ1j/wMZTMl8HUuKsbcdk w3rMkHxU7WnIH6Cu3cCNOJFU/PLVBXNioMf/5ZZBsYUgbS/1QYchoQQpWfNgjc7SH0HB 7ixiNnBJhzM/QFNblwGYgWAdcqGTnj9HdxvexuPsT3LPLNt25Ubuy4BBSP2TNQZMlpN8 vM+Cvn9p7LMfOsIsjJwasktFy8whfzbihMV8trIQR3p2w/n5FXRGdY4J5+KgBX6FBNMw 22vw== X-Gm-Message-State: AMke39nReFFWUN1v7C7NYMC43irH9SG+TucdjqCNut+NJdgPTG54PbdkMAzp2lQ3rslReA== X-Received: by 10.99.115.12 with SMTP id o12mr25455429pgc.165.1488870850406; Mon, 06 Mar 2017 23:14:10 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:09 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:47 -0800 Message-Id: <20170307071349.16444-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 12/14] ltrace: Fix build with aarch64 and bump to latest 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 --- .../ltrace/ltrace/0001-Use-correct-enum-type.patch | 28 ++++++++ .../ltrace/0002-Fix-const-qualifier-error.patch | 76 ++++++++++++++++++++++ meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 6 +- 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch new file mode 100644 index 000000000..01a35842c --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch @@ -0,0 +1,28 @@ +From df490528d1e81a98ba2991c700c92a8e6c969083 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 Mar 2017 21:32:22 -0800 +Subject: [PATCH 1/2] Use correct enum type + +Clang warns about wrong enum initializtion + +Signed-off-by: Khem Raj +--- + sysdeps/linux-gnu/aarch64/fetch.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/linux-gnu/aarch64/fetch.c b/sysdeps/linux-gnu/aarch64/fetch.c +index 2744df0..1dcf7cc 100644 +--- a/sysdeps/linux-gnu/aarch64/fetch.c ++++ b/sysdeps/linux-gnu/aarch64/fetch.c +@@ -173,7 +173,7 @@ static struct fetch_script + pass_arg(struct fetch_context const *context, + struct process *proc, struct arg_type_info *info) + { +- enum fetch_method cvt = CVT_NOP; ++ enum convert_method cvt = CVT_NOP; + + size_t sz = type_sizeof(proc, info); + if (sz == (size_t) -1) +-- +2.12.0 + diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch new file mode 100644 index 000000000..c15277192 --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch @@ -0,0 +1,76 @@ +From 4d3ec1a514f9b1df8ce3a1b04c8a2823d977377f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 Mar 2017 21:34:01 -0800 +Subject: [PATCH 2/2] Fix const qualifier error + +Fixes clang warning +error: duplicate 'const' declaration specifier [-Werror,-Wduplicate-decl-specifier] + +Signed-off-by: Khem Raj +--- + dict.h | 2 +- + library.c | 2 +- + vect.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +Index: git/dict.h +=================================================================== +--- git.orig/dict.h ++++ git/dict.h +@@ -90,7 +90,7 @@ int dict_clone(struct dict *target, cons + assert(_source_d->values.elt_size == sizeof(VALUE_TYPE)); \ + /* Check that callbacks are typed properly. */ \ + void (*_key_dtor_cb)(KEY_TYPE *, void *) = DTOR_KEY; \ +- int (*_key_clone_cb)(KEY_TYPE *, const KEY_TYPE *, \ ++ int (*_key_clone_cb)(KEY_TYPE *, KEY_TYPE *, \ + void *) = CLONE_KEY; \ + void (*_value_dtor_cb)(VALUE_TYPE *, void *) = DTOR_VALUE; \ + int (*_value_clone_cb)(VALUE_TYPE *, const VALUE_TYPE *, \ +Index: git/library.c +=================================================================== +--- git.orig/library.c ++++ git/library.c +@@ -353,7 +353,7 @@ static void + library_exported_names_init(struct library_exported_names *names) + { + DICT_INIT(&names->names, +- const char*, uint64_t, ++ char*, uint64_t, + dict_hash_string, dict_eq_string, NULL); + DICT_INIT(&names->addrs, + uint64_t, struct vect*, +Index: git/vect.h +=================================================================== +--- git.orig/vect.h ++++ git/vect.h +@@ -66,7 +66,7 @@ int vect_clone(struct vect *target, cons + assert(_source_vec->elt_size == sizeof(ELT_TYPE)); \ + /* Check that callbacks are typed properly. */ \ + void (*_dtor_callback)(ELT_TYPE *, void *) = DTOR; \ +- int (*_clone_callback)(ELT_TYPE *, const ELT_TYPE *, \ ++ int (*_clone_callback)(ELT_TYPE *, ELT_TYPE *, \ + void *) = CLONE; \ + vect_clone((TGT_VEC), _source_vec, \ + (int (*)(void *, const void *, \ +Index: git/value_dict.c +=================================================================== +--- git.orig/value_dict.c ++++ git/value_dict.c +@@ -40,7 +40,7 @@ val_dict_init(struct value_dict *dict) + } + + static int +-value_clone_cb(struct value *tgt, const struct value *src, void *data) ++value_clone_cb(struct value *tgt, struct value *src, void *data) + { + return value_clone(tgt, src); + } +@@ -53,7 +53,7 @@ value_dtor(struct value *val, void *data + + static int + named_value_clone(struct named_value *tgt, +- const struct named_value *src, void *data) ++ struct named_value *src, void *data) + { + tgt->name = strdup(src->name); + if (tgt->name == NULL) diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 8ae018503..60068ae96 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -10,14 +10,16 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" PE = "1" -PV = "7.3+git${SRCPV}" -SRCREV = "01b10e191e99d8cb147e5a2b7da8196e0ec6fb94" +PV = "7.91+git${SRCPV}" +SRCREV = "c22d359433b333937ee3d803450dc41998115685" DEPENDS = "elfutils" RDEPENDS_${PN} = "elfutils" SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ file://configure-allow-to-disable-selinux-support.patch \ file://0001-replace-readdir_r-with-readdir.patch \ + file://0001-Use-correct-enum-type.patch \ + file://0002-Fix-const-qualifier-error.patch \ " S = "${WORKDIR}/git" From patchwork Tue Mar 7 07:13:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94948 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765681qgd; Mon, 6 Mar 2017 23:16:25 -0800 (PST) X-Received: by 10.99.98.6 with SMTP id w6mr25503622pgb.223.1488870985226; Mon, 06 Mar 2017 23:16:25 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d5si21647741pfl.24.2017.03.06.23.16.24; Mon, 06 Mar 2017 23:16:25 -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; 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 A0A4277647; Tue, 7 Mar 2017 07:15:16 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id A11E573109 for ; Tue, 7 Mar 2017 07:14:09 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 187so8406048pgb.2 for ; Mon, 06 Mar 2017 23:14:11 -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=ztD2fVkoTHcJXToxjCp6ZkWNEsEhbFiLf/Xqiw0vihs=; b=UC7Ktp5X32YToioCbnCTxv6ju+BTiiazYKFlxw85zxZ/5ZoYYmqhkCsgrWJT8U49La Rh0whvTf3UVhZsgaqJd+q3xa29ETPn8eqEcsyK2UuzU6/y3c1vYycZrM7h50XqudMOqW urJAXFkaPAwz4V0O7MQ4WDvw2nvNapG6ChH6n64OyEBgef97bJdOBxf7w75C80l1NTWT rG57bw8tkT+QfomLLdJZ2O185wGRlRCr12Qne/o8R50PvhRAGWWEyIgCcsTev/jpH/Kv hMksjuj9kJLWhSbDSO9xjTX2q5DlV2MlGpuW8IoEwEDzOEE7ETcGaqP2TilX7KSDjHPL XKWw== 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=ztD2fVkoTHcJXToxjCp6ZkWNEsEhbFiLf/Xqiw0vihs=; b=d54WRkfE7qvnM4iPi0PiGF4u2+4yqGydEkB4MUm/3jJDl1TJ+XzvWd80xuB5UrA0lw 41B5uVB8loAzyI36WGF8O8noRN5P7DpqKTfXLnak06i30yuupOcRzOGRRnFWAQ0lRGIY cawvs7I/vOVJh2NMuHpMrpmuGtQza/AhFIkNK0IcIaa2PekeZvaljRuXJBaVyhJBzQFz F6BHUFg/+A9a24ElT6oIfgM7QjT/IEcx7rWY40SQASt53GTff7Ez7iv6C4U5DIRllOru HZuBCPt0wp/1HfZR7mntVQY25MMQFBiQB5ydGwepBfrouBTEZvBvNFfsId1pjbvi1NGx sUtQ== X-Gm-Message-State: AMke39ly7VT4qtGKDO/yKCSjnMdGVkHyBCPTNxE+jpP3CPRRVzNEJ6JhtJHpnpHFNTvt+w== X-Received: by 10.99.157.2 with SMTP id i2mr9078690pgd.139.1488870851268; Mon, 06 Mar 2017 23:14:11 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:10 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:48 -0800 Message-Id: <20170307071349.16444-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 13/14] iptraf: Fix build with clang 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 --- .../iptraf/iptraf/format_string.patch | 31 +++++++++++++++++++ .../recipes-devtools/iptraf/iptraf/ldopts.patch | 35 ++++++++++++++++++++++ meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb | 7 +++-- 3 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/iptraf/iptraf/format_string.patch create mode 100644 meta-oe/recipes-devtools/iptraf/iptraf/ldopts.patch -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/iptraf/iptraf/format_string.patch b/meta-oe/recipes-devtools/iptraf/iptraf/format_string.patch new file mode 100644 index 000000000..5f96f0f4c --- /dev/null +++ b/meta-oe/recipes-devtools/iptraf/iptraf/format_string.patch @@ -0,0 +1,31 @@ +Index: iptraf-3.0.0/src/othptab.c +=================================================================== +--- iptraf-3.0.0.orig/src/othptab.c ++++ iptraf-3.0.0/src/othptab.c +@@ -335,7 +335,7 @@ void printothpentry(struct othptable *ta + break; + } + +- sprintf(scratchpad, inet_ntoa(saddr)); ++ sprintf(scratchpad, "%s", inet_ntoa(saddr)); + strcat(msgstring, scratchpad); + wattrset(table->othpwin, ARPATTR); + break; +@@ -354,7 +354,7 @@ void printothpentry(struct othptable *ta + break; + } + +- sprintf(scratchpad, rarp_mac_addr); ++ sprintf(scratchpad, "%s", rarp_mac_addr); + strcat(msgstring, scratchpad); + wattrset(table->othpwin, ARPATTR); + break; +@@ -421,7 +421,7 @@ void printothpentry(struct othptable *ta + wattrset(table->othpwin, UNKNIPATTR); + protptr = getprotobynumber(entry->protocol); + if (protptr != NULL) { +- sprintf(protname, protptr->p_aliases[0]); ++ sprintf(protname, "%s", protptr->p_aliases[0]); + } else { + sprintf(protname, "IP protocol"); + unknown = 1; diff --git a/meta-oe/recipes-devtools/iptraf/iptraf/ldopts.patch b/meta-oe/recipes-devtools/iptraf/iptraf/ldopts.patch new file mode 100644 index 000000000..c84a0a0ad --- /dev/null +++ b/meta-oe/recipes-devtools/iptraf/iptraf/ldopts.patch @@ -0,0 +1,35 @@ +Index: iptraf-3.0.0/src/Makefile +=================================================================== +--- iptraf-3.0.0.orig/src/Makefile ++++ iptraf-3.0.0/src/Makefile +@@ -5,7 +5,7 @@ + # + # Architecture determination string borrowed from the kernel makefile. + # +-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ ++ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/) + PLATFORM = -DPLATFORM=\"$(shell uname -s)/$(ARCH)\" + VERNUMBER := $(shell cat version) +@@ -17,7 +17,7 @@ VERSION = -DVERSION=\"$(VERNUMBER)\" + # + BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH) + +-CC = gcc ++CC = $(CC) + LIBS = -L../support -ltextbox -lpanel -lncurses # in this order! + + # comment this one out to omit debug code when done. +@@ -31,10 +31,10 @@ PROF = #-pg + # options to be passed to the compiler. I don't believe they need to be + # modified (except for -m486 on non-Intel x86 platforms). + +-CFLAGS = -Wall #-O2 #-m486 ++CFLAGS ?= -Wall #-O2 #-m486 + DIRS = -DWORKDIR=\"$(WORKDIR)\" \ + -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\" +-LDOPTS = #-static ++LDOPTS ?= #-static + + # you may want to change this to point to your ncurses include directory + # if the ncurses include files are not in the default location. diff --git a/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb b/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb index e7a406fc5..abfab02e0 100644 --- a/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb +++ b/meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb @@ -12,12 +12,15 @@ DEPENDS = "ncurses" SRC_URI = " \ ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.0.tar.gz \ - file://0001-src-Fix-error-in-cross-compile.patch" + file://0001-src-Fix-error-in-cross-compile.patch \ + file://format_string.patch \ + file://ldopts.patch \ +" SRC_URI[md5sum] = "377371c28ee3c21a76f7024920649ea8" SRC_URI[sha256sum] = "9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163" RDEPENDS_${PN} = "ncurses" -EXTRA_OEMAKE = "-e MAKEFLAGS=" +EXTRA_OEMAKE = "-e MAKEFLAGS= LDOPTS='${LDFLAGS}' ARCH='${TARGET_ARCH}'" do_compile() { oe_runmake -C src all From patchwork Tue Mar 7 07:13:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 94949 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1765716qgd; Mon, 6 Mar 2017 23:16:33 -0800 (PST) X-Received: by 10.99.97.69 with SMTP id v66mr25912665pgb.124.1488870993013; Mon, 06 Mar 2017 23:16:33 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 24si21623321pfq.101.2017.03.06.23.16.32; Mon, 06 Mar 2017 23:16:33 -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; 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 B307C77631; Tue, 7 Mar 2017 07:15:17 +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 A7E6D7756E for ; Tue, 7 Mar 2017 07:14:10 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id j5so20183062pfb.3 for ; Mon, 06 Mar 2017 23:14:12 -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=HFCNsBc9nja8neLrPCfdl51bdSh3KBuKatGudJxiy1Q=; b=nSot7pkWv50oKDqXi5gB3Kd4GFdBhg4gijZWcdW9XDI/gD6Ar9oJtKBf2Njn6CFvPN A6Zw3NERclAFROB4o9vBUYa5A4NhGFD/0J3qrKGu6ADjRIWUtkv8YwJSSrfo2Dr41MXT 7RsWDFzCodn0CfuEYjYrLS3Ena5MBJGdDVLPS5kYvHDZLHvGniddt0MvMfgfYNrTr0fZ bRagVhNQnaPiiKQABYDavnVFr6mvg1DgGkBYZntM8VIDKa4XHjDb3v74gDke37BuJJQd 5Mx3Gnn7XNxl9PEgJgCYmeGEUYBgUdmq8ZLDPjxraZi1GUJnuFDowEkKCZA2cTrXx2N5 X7TA== 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=HFCNsBc9nja8neLrPCfdl51bdSh3KBuKatGudJxiy1Q=; b=PjV1rRB2cWpsOUSCK5M2+RGtk/65pWivOo858kxGiddpC1xjyleGjm9tacZm8+lYUl t9xb7tuw/8jxJg1ievP9tCCt1v35P/VbUCxXxnVNCaFDhK4R1sCbDgzMH4BFJzGhG2wQ QMJ4PbizYeOnxnU0IenRhB2cg8Le1ATrEJV9lli8UYPNJ9c/eZCYSMKWNJneLML/jn8K 1j4a60l2tEAyO0PqbHgsf9YB/Or9zJ76Hd6md7ZeOPEncZQlLTQUVwHy8sNocPgTUzk7 51M0Ian0EeEe2syr8yDSzw6NAHfYZwh1HHaLiyH57cjFTWpq8pB1laIehEThKlwV2UPC wI7g== X-Gm-Message-State: AMke39noQI6rgGBgZT+o5DPXoD9ix32JyVCHPmt/aTzV8G7FpgrgID3efF/BZTRMUQoFmw== X-Received: by 10.84.197.3 with SMTP id m3mr32423366pld.89.1488870852090; Mon, 06 Mar 2017 23:14:12 -0800 (PST) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id r134sm43530858pfr.83.2017.03.06.23.14.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 23:14:11 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Mar 2017 23:13:49 -0800 Message-Id: <20170307071349.16444-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170307071349.16444-1-raj.khem@gmail.com> References: <20170307071349.16444-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 14/14] libtorrent, rtorrent: Update to 0.13.6+git 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 --- .../{libtorrent_0.13.3.bb => libtorrent_0.13.6.bb} | 13 ++++++++++--- .../rtorrent/{rtorrent_0.9.3.bb => rtorrent_0.9.6.bb} | 12 +++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) rename meta-oe/recipes-connectivity/libtorrent/{libtorrent_0.13.3.bb => libtorrent_0.13.6.bb} (60%) rename meta-oe/recipes-connectivity/rtorrent/{rtorrent_0.9.3.bb => rtorrent_0.9.6.bb} (57%) -- 2.12.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb similarity index 60% rename from meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb rename to meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb index 4af3a6a6a..7153cff6c 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.6.bb @@ -6,12 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "libsigc++-2.0 openssl cppunit" -SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \ +SRC_URI = "git://github.com/rakshasa/libtorrent;protocol=git;branch=master \ file://don-t-run-code-while-configuring-package.patch \ " +SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87" -SRC_URI[md5sum] = "e94f6c590bb02aaf4d58618f738a85f2" -SRC_URI[sha256sum] = "34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677" +PV .= "+git${SRCPV}" + +S = "${WORKDIR}/git" inherit autotools pkgconfig +EXTRA_OECONF = "--without-zlib" + +do_configure_prepend() { + (cd ${S}; ./autogen.sh; cd -) +} diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb similarity index 57% rename from meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb rename to meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb index eb0a39af5..817c24345 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.6.bb @@ -5,11 +5,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" -SRC_URI = "http://libtorrent.rakshasa.no/downloads/${BP}.tar.gz \ +SRC_URI = "git://github.com/rakshasa/rtorrent;protocol=git;branch=master \ file://don-t-run-code-while-configuring-package.patch \ " +SRCREV = "226e670decf92e7adaa845a6982aca4f164ea740" -SRC_URI[md5sum] = "0bf2f262faa8c8c8d3b11ce286ea2bf2" -SRC_URI[sha256sum] = "9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310" +PV .= "+git${SRCPV}" + +S = "${WORKDIR}/git" inherit autotools pkgconfig + +do_configure_prepend() { + (cd ${S}; ./autogen.sh; cd -) +}