From patchwork Mon Apr 2 01:10:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 894088 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CqEFsJff"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uBYycVFa"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40DvLh5vFJz9s2B for ; Mon, 2 Apr 2018 11:11:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ODQfHKA4H+glVIBGbmWYYrcf1k7LRvDuZfMx8ds2LF8=; b=CqEFsJffYv0he4 TYW2upzozJRyAc9M+KUA7BmpQW/BSefozBqgqeYEm2AU88jpQsvL8cCI7cjnv2I+xTdVuMjdRJnIB WfT04P9wEifMkA6Y4jeNAKL/Tces4yvY3aU1TUqzfxNLgDgtpXVEBpnaYJvYs6kB/FyWmSZcdy3MN xohr3qytRExRJtkPlSg2iLRxBDcHpj4f/Db4iFhTowPUAJEXb58jtM8qb7oI3gjIGQkWldIMghVV9 E3ojsUqa9KNGXF2JmI3jF49ZHRmdBccvNdn+P+ZG1lTF5m9IBjbw2kYhSU8vkMcf8GHSf0aQC7xES w26hK3Eck8RUiPMvIeIg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f2nzx-0001C5-UM; Mon, 02 Apr 2018 01:11:01 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f2nzu-0001AG-EN for lede-dev@lists.infradead.org; Mon, 02 Apr 2018 01:11:00 +0000 Received: by mail-pf0-x244.google.com with SMTP id y69so8464551pfb.5 for ; Sun, 01 Apr 2018 18:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ClGeZlawxmJQHwKytcutcbRyUlhLMTt1R1vLvlEm0dE=; b=uBYycVFatkujsXgWfNQKe9SVQZBv4RJ88xxZUapiS20XYN1n4sNxEdJOO1DbHwHQO2 rNWmPpaQJA/CsmYv9CUO2e+Kiy3TZcp0tLyywe7Vrd8z8TNFyHbHiE/IVmrWfBCWYv3A gqmeuls1hAWiIfJ3hc0JnRsIyh1XRpT8RMiw8Lz5I8ckbK2zHv7fJPMpGxrjrTu8MqcY gY+XE6/wv9wCruVnjLvYF7GT2jPfiebiowBMeUxETcIMHYwk5zvMSS/DxulgXpYLWhba jgqvWaQXPUj7a4svp40yOgKzbCqgAhj0ODKShJsEA/yF637wdcgTp5zHernwVjR0oGoW OqMg== 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=ClGeZlawxmJQHwKytcutcbRyUlhLMTt1R1vLvlEm0dE=; b=m0VAFNvWscuhRx2RDBe5x4FzJtu9kD1YbxnOAxzvOeoDcIVDg8QXyV1BSiH5EUJOGD r1PI9V2ncA/a3VNRJ2Q44sY5kcr4TsVFcsyNaakIS013R/WvJVuCpLr5eYDz1a4/9q1L 7yG5zCGxLmGeYqzo2LS2TACL8D7mz2D3yGPHsYADxrrSEFuntZCCuoDVQc1EYST+kib8 S/x06nVE6hPY1fkIs8WCn4m86GlUB1Wcf1xEIAir1p/aHFTBrXq/3KpOOy2N7ZGmRn6A djLRKyWNem+YrMksPDMdFQomgc8CvSoFIq06bBq2aRENDy3HJhJkv9j0M1lOQi27EUTV 2p1Q== X-Gm-Message-State: AElRT7EJqErE5AcVA9HFXhn5c6YdhVAW4jcGOTzsJGsoRJQ4eUcfKbFF NvD5OTnAmxGxHuQgZK4F+zZJofOG X-Google-Smtp-Source: AIpwx4+YVcrEbgsb5auYxaQ4DUtAznKiREn7LEJvg/4YLuEMqyO9dU2XuBwNuyKuwn5zX+i+YUHN0w== X-Received: by 10.99.100.68 with SMTP id y65mr5078071pgb.257.1522631444300; Sun, 01 Apr 2018 18:10:44 -0700 (PDT) Received: from desktop.lan (astound-69-42-5-101.ca.astound.net. [69.42.5.101]) by smtp.gmail.com with ESMTPSA id c62sm29056383pfk.179.2018.04.01.18.10.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Apr 2018 18:10:43 -0700 (PDT) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Sun, 1 Apr 2018 18:10:40 -0700 Message-Id: <20180402011040.29068-1-rosenp@gmail.com> X-Mailer: git-send-email 2.16.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180401_181058_525125_692A6A79 X-CRM114-Status: UNSURE ( 9.00 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c00:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] ncurses: Remove obsolete compile fixes X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org It seems both issues (GCC5 and Musl) were fixed at some point. Thus, they can be dropped. Did not bump version as there is no change in functionality or size. Compile-tested on ar71xx and mvebu, both with musl. Signed-off-by: Rosen Penev --- .../ncurses/patches/102-ncurses-5.9-gcc-5.patch | 44 ---------------------- .../ncurses/patches/200-fix_missing_include.patch | 14 ------- 2 files changed, 58 deletions(-) delete mode 100644 package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch delete mode 100644 package/libs/ncurses/patches/200-fix_missing_include.patch diff --git a/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch b/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch deleted file mode 100644 index b84fcb965c..0000000000 --- a/package/libs/ncurses/patches/102-ncurses-5.9-gcc-5.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://bugs.gentoo.org/545114 - -extracted from the upstream change (which had many unrelated commits in one) - -From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 -From: "Thomas E. Dickey" -Date: Sun, 7 Dec 2014 03:10:09 +0000 -Subject: [PATCH] ncurses 5.9 - patch 20141206 - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - ---- a/ncurses/base/MKlib_gen.sh -+++ b/ncurses/base/MKlib_gen.sh -@@ -505,11 +505,22 @@ sed -n -f $ED1 \ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 < $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/package/libs/ncurses/patches/200-fix_missing_include.patch b/package/libs/ncurses/patches/200-fix_missing_include.patch deleted file mode 100644 index 4616c4fb70..0000000000 --- a/package/libs/ncurses/patches/200-fix_missing_include.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/ncurses/curses.priv.h -+++ b/ncurses/curses.priv.h -@@ -55,6 +55,11 @@ extern "C" { - - #include - -+#if NEED_WCHAR_H -+#include -+#include -+#endif -+ - #if USE_RCS_IDS - #define MODULE_ID(id) static const char Ident[] = id; - #else