From patchwork Tue Sep 25 11:03:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kardell X-Patchwork-Id: 974354 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="K6Fz/4q5"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=telliq.com header.i=@telliq.com header.b="qprRTEF9"; 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 42KJCm1LZ0z9s9G for ; Tue, 25 Sep 2018 21:06:12 +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=7BvVxsy3/+GgL4zzrWrmjpvIUTZMqshNF+kF7cH9y7A=; b=K6Fz/4q5dMf+Jf 3+zNoliWbgGockyUViUmrx3mb5k+VojMB0Ip9hzS5DGzHYJGPWyFGhEcA8ZejkaMGyNyW91ma6s9o Z9cet+1yBYYFHB0UV8ID8Ft0QXa61Ti2Ku7WvvA9olfhZ/hoPSbv35u3coWkOfM9g802ZbQis58PR znV138gcwEloaB20Pe7+CPG6/UcJHKfjJCz8VsDCeO1MCxRZzS//5p8Rd+TiPlFro4qv1jjw2lo7d JNeBG63MjH1TtjVUPqumgYwNGxBFSWzqDoZhmdRELmqpuZuR/uasmzmPEDZucmMTpYU55/SJFAJaU UeKYFH8myQ/G5/0NotPw==; 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 1g4lAM-0002H2-Ht; Tue, 25 Sep 2018 11:06:06 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g4l9y-0001ZR-Sf for openwrt-devel@lists.openwrt.org; Tue, 25 Sep 2018 11:05:44 +0000 Received: by mail-lj1-x243.google.com with SMTP id y71-v6so4831783lje.9 for ; Tue, 25 Sep 2018 04:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telliq.com; s=google; h=from:to:cc:subject:date:message-id; bh=YBq5MjdCHTwP8y1woRrb7FZYNEjJjUKvTkB7uC334bo=; b=qprRTEF9oX+sz0CbWOYftmC989ts9hGVNnctgZu9G6aWbr+7vA2WprNfvfnkKVCf/p naTbVLy+SDjA7+5EFSdiIdU13Ru0hL2F5fdNW2LvQeN9uWoAXvJcO/pGZgGGf9P1/Yre JglXGLJff39Q7J8eHReYBfe1+eVeIUNEAPNBb1rgUhU8rAQuGeFiAruODr9PkBCyy6j/ B7XSqohWs8U3EMUPW4EjYd+eZMP+ylsYHn2ZNjySXTKb+6RihAJzbkesB26z6Zy+zxXV z6PTIadTtfcZs/sZUtPx/VhlvLxrjlNUll5+2GXU5m3f8STZhWGK0o0AjroqGXbh+Pyu O3DA== 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=YBq5MjdCHTwP8y1woRrb7FZYNEjJjUKvTkB7uC334bo=; b=o0e/rJZ9PwlIG5i6j62DW9r5+THYzy3VtQQgXBF4HCmFG7CNYwsAUCjSyERlEeS0fn gSjoHwqbk0ZHHaUY96OU63PDODiA0/VfWvtmFPLJJAlEbmxlu8LZfiYt8vGcZOKupgAV Q/Pg9XQNthI3c3Y2OYKRiM5fwIBQojthR7KYNYV5TJMxvm0SVF10eHUJ9HySOKtfozEP E+UNG0sTjv+I//WvrnTYRbPfLwScauuKtFtoHhmclwJ7CmV3SuuzHQjBAa682WyNE31o AkCb30E31GWk7om3sbimnkZEiRvmD1p4zn6p1B46noQ7BB9Q8MAwSsG9a4s1anHK5DvS SjPQ== X-Gm-Message-State: ABuFfoipnxrC8AB5IWqosML1CPWxE+PpjQuiFPrqEGWzirqnHjWxzTwI G0+9zZJj6sACPYY7BKUSAPCp/l7vcAZP+g== X-Google-Smtp-Source: ACcGV63UZg0wHSV9vFlyp5aV7RjqRzbZ2kCYyhO68qZt0XKlxeaVhf7fxIoRgJ09F4Y5olanVVLPcA== X-Received: by 2002:a2e:7217:: with SMTP id n23-v6mr428571ljc.71.1537873509557; Tue, 25 Sep 2018 04:05:09 -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 8-v6sm101226lfb.78.2018.09.25.04.05.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 04:05:08 -0700 (PDT) From: jan.kardell@telliq.com To: openwrt-devel@lists.openwrt.org Date: Tue, 25 Sep 2018 13:03:55 +0200 Message-Id: <20180925110355.8499-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-20180925_040543_092847_FED1544D X-CRM114-Status: UNSURE ( 8.51 ) 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:243 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: , Cc: Jan Kardell MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Jan Kardell 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