From patchwork Wed Sep 26 13:06:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kardell X-Patchwork-Id: 975078 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=telliq.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dT3wLWUm"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=telliq.com header.i=@telliq.com header.b="KCYU6AFf"; 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 42KysR1nDlz9s2P for ; Wed, 26 Sep 2018 23:07:38 +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:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=eUeWomTVY9ca2qYk8q9XYNXe7ONyP/WueXviAiMdahQ=; b=dT3wLWUmwJTs1V BGlpfv05Jdjmh89bGLZFnsxWo7Jw5zxl1sGReHr08IYmiD5EEs4tmKkLhrK4uOMp0HxZfOeAlZNgC nWJXd+88GUUseP84A+RDE7DUaFoTmtCN5aHzp+QfFN8o+RBvUdONYsXsyhBEbbVQOZcuorLh4oF7N MyTclbBFTXTkBFxihinxLOT2QaWzsbJ3YyqlyMvsjt8ndY5O8FhoLhHOUr7a9WG1aDnBdLUBrm12a PLSo8GBlo5pyKDHh/SysQFykhW2m4SNsYgBY6OgafxDqA9TEDLN8UmFE8bUZxOe3BfkNPXXdab39B d9YSsk0DuF6LVamuyGFg==; 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 1g59XK-000674-QN; Wed, 26 Sep 2018 13:07:26 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g59Ww-0005jL-QP for openwrt-devel@lists.openwrt.org; Wed, 26 Sep 2018 13:07:04 +0000 Received: by mail-lf1-x141.google.com with SMTP id x24-v6so23125493lfe.10 for ; Wed, 26 Sep 2018 06:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telliq.com; s=google; h=from:to:subject:date:message-id; bh=KE0NSAYaZ90tAqOoACy3WnS4sOYuhLbAIILELSRl/6A=; b=KCYU6AFfz592Iod5CIQWGVvwc93XIYkRYp6xfwPLLG/Z4FRaNVn7L5MOQfyluhpjbl 0mUP3aY4BUYaAuTGlKaXvk5mHR2G+4tU/41TTFo4OQI+LlHCnsjhZRRTIRZkuPSxjiC1 8AhdoNkxUksZ9rX19lb7mDqgztqojZmqeyqPD2bQ4LvqeJc9a4TBdaSiSZKljjoJtRq8 YoRSVGMjJO6j0CD2lm8r5YH0KhB5AyfxlJZkflFZl1yv2PY13ZEMKYM8HejiHocYRl72 +J33LoboQ9QRvpSwCkpDNK9n20DiYz8dmgCJOzWb2hyN4WMB5Y2mPgz1pUpfZmTphHgB ZgPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=KE0NSAYaZ90tAqOoACy3WnS4sOYuhLbAIILELSRl/6A=; b=lTYnI1xPMonl5zGTApNSYC0W4GhyezsI6gAAjyNQX7JJAeDT316DlmGI6BSpOXlC3X T+Pwd0Ij7iG6kJ4b+s9L05DamdDhl/SQWNtrF1PYK6+3wEUCRA1v8BlQfzmCSZPM2QCm oErglpYn/cbfH/5wYQOYlGom1sjzz0hfxoWw4sUXA9H2SwbY3cNEOVePp6I1H0AUTA9X X6ufXat7tacHwwYfSSe/EA/dtG6D0d8aEuZRTzwKmC0MBcVfVDD/hujJcHVELDlOQpR2 Wm0Qc1n4alRVTyvHhKHmU73cF0VPvE2mxNnB6kxweAl4hYdijXPRjUOs+PgnYXGWeI1/ rN2Q== X-Gm-Message-State: ABuFfoi/jLI0YKG6SiIbWUvAisEWFgmU7rRplirs6ZL/MUkmuXUw7aY/ lZjrlEogtfmqANeLU8n2E8d2XI0BCzXraA== X-Google-Smtp-Source: ACcGV609B/CLDZRWdh9OefzwZ8JT3lrDtBpg2RfYyXeqADYwvW/2RqKWpzKe/0gQQeQLBs2BPlrEMA== X-Received: by 2002:a19:4acd:: with SMTP id x196-v6mr4109379lfa.130.1537967196310; Wed, 26 Sep 2018 06:06:36 -0700 (PDT) Received: from emu.mida (static-212-247-121-18.cust.tele2.se. [212.247.121.18]) by smtp.gmail.com with ESMTPSA id u6-v6sm978753ljk.62.2018.09.26.06.06.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 06:06:35 -0700 (PDT) From: Jan Kardell To: openwrt-devel@lists.openwrt.org Date: Wed, 26 Sep 2018 15:06:34 +0200 Message-Id: <20180926130634.3764-1-jan.kardell@telliq.com> X-Mailer: git-send-email 2.16.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180926_060703_120568_6D5B94C4 X-CRM114-Status: UNSURE ( 7.88 ) 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 [2a00:1450:4864:20:0:0:0:141 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -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 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different Subject: [OpenWrt-Devel] [PATCH] ncurses: Add ncurses6 config X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This is needed by gpsd. Otherwise it finds and uses the build hosts version of ncurses header files. And that is not compatible, at least on openSUSE. Also use relative symlinks to the ncursesw6-config file. This patch is needed in master and 18.06 branch. Signed-off-by: Jan Kardell --- package/libs/ncurses/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile index 94c968816f..3c51b75129 100644 --- a/package/libs/ncurses/Makefile +++ b/package/libs/ncurses/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses PKG_VERSION:=6.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -148,13 +148,16 @@ define Build/InstallDev for lib in ncurses panel menu form; do \ ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \ done + ln -s . $(1)/usr/include/ncurses ln -s . $(1)/usr/include/ncursesw $(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a $(INSTALL_DIR) $(2)/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw6-config $(2)/bin/ $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \ $(2)/bin/ncursesw6-config - ln -sf $(STAGING_DIR)/host/bin/ncursesw6-config $(1)/usr/bin/ncursesw6-config + ln -rsf $(2)/bin/ncursesw6-config $(1)/usr/bin/ncurses6-config + ln -rsf $(2)/bin/ncursesw6-config $(2)/bin/ncurses6-config + ln -rsf $(2)/bin/ncursesw6-config $(1)/usr/bin/ncursesw6-config endef define Host/Compile