From patchwork Wed Jun 7 15:53:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 772478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wjY4T2jXhz9s2G for ; Thu, 8 Jun 2017 01:53:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WgNSoCmc"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 45E733077F; Wed, 7 Jun 2017 15:53:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jg9hSpoz8SCi; Wed, 7 Jun 2017 15:53:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3BE7E30706; Wed, 7 Jun 2017 15:53:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3AD0B1C0ACA for ; Wed, 7 Jun 2017 15:53:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2DE5D30706 for ; Wed, 7 Jun 2017 15:53:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 02P-2uKLzrxo for ; Wed, 7 Jun 2017 15:53:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f51.google.com (mail-it0-f51.google.com [209.85.214.51]) by silver.osuosl.org (Postfix) with ESMTPS id 070AB305C2 for ; Wed, 7 Jun 2017 15:53:21 +0000 (UTC) Received: by mail-it0-f51.google.com with SMTP id m62so113265217itc.0 for ; Wed, 07 Jun 2017 08:53:20 -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=SIFItjWknoRUpsCp8+JHSI+9SImU6x0ZHfadW6COg5k=; b=WgNSoCmcEo9uzntvQ3IIwf8g331ok6BQWZ3LWWqrRIabtXUm0PK+eP6keQppfj1w/b rIdsTZuDWZWbSTmF6Yf+51JHwUJ41WQOg1Uem9EOGU/dFdKTrCtJ1BbufUudFp/UpbE9 JU+9mZPlSoMtedim3Ksc3MkYw8bZsBWk7Uzng1YgxCEEB99uBlplt5nLg9Uttqnzasaf Jlm6Zd/4Foc1K2TWYAw+KeL5wpCVeoHnIhKZ31JNUbXO9MMzxK3gSRu8BoG0gm7Xcg1m 3VkRr9UVPduPFYG1CywBxYXpva/4SDpXr2jFn0N39d6kbNKrBZzc3AIrjK1dpFEBKGWG 67mg== 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=SIFItjWknoRUpsCp8+JHSI+9SImU6x0ZHfadW6COg5k=; b=loaLwPATAh4whIINfZkUY1X22cZ7t+cR3wFCM039oZxoxFXXnLzVplNRUbTHbaW0ID BfKWvQ/D1Fxa4VDE1A+Bg/H4VzB5ygxbXLLW93PVVtCJxiJ1qVdLoKogyCgU//C1Qq+G sNNPokzW2fFn6VObOBQ+YwflSSKZD6YB0zcF9E0wEtZus2hhi03eTFJi3qWcEN2d6WpZ I2BEKACmj7ZzhuBFN714LSzJd11vMps3iBAi0gW5rx/aK6a8A5aUi4ReumfKi9Im2A/j 5CHzZ8RgFjn08TF6rEqLDvtnWvlodzmnMe61Qi+WXWMsRv5FJO3NvjrqeVlCdfwnrMWc REUw== X-Gm-Message-State: AODbwcBDWVTjdrJJYZvDRerqLNUX14FNmXAbWD9FMlEJAVtPWdYz/VZK XdxEXOMrrtzc738dCh8= X-Received: by 10.36.78.145 with SMTP id r139mr484221ita.24.1496850800055; Wed, 07 Jun 2017 08:53:20 -0700 (PDT) Received: from aduskett.codeblue.local (mail.codeblue.com. [65.183.183.198]) by smtp.gmail.com with ESMTPSA id w4sm1125628ita.5.2017.06.07.08.53.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jun 2017 08:53:19 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Wed, 7 Jun 2017 11:53:16 -0400 Message-Id: <20170607155316.25646-1-aduskett@codeblue.com> X-Mailer: git-send-email 2.9.4 Cc: Adam Duskett Subject: [Buildroot] [PATCH v2] sngrep: fix wchar detection. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Ncurses detection is currently broken in buildroot. This patch does the following: - Add SNGREP_CHECK_SCRIPT to configure.ac which checks for a libname, a function in that library, sets a define if found, and if not found, moves on to the next part. This is taken from the htop configure.ac. - Adds SNGREP_CHECK_LIB to configure.ac which checks for a library, a function within that library, sets a define if that function is found, and if not found, moves on to the next part. This is taken from the htop configure.ac - Modifies scrollbar.h and ui_panel.h to include instead of if unicode is supported. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Added # Locally computed header to sngrep.hash - The original patch was committed upstream. Moved patch to a url and added a sha256 sum for the patch. package/sngrep/sngrep.hash | 2 ++ package/sngrep/sngrep.mk | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash index bc28545..5966d63 100644 --- a/package/sngrep/sngrep.hash +++ b/package/sngrep/sngrep.hash @@ -1 +1,3 @@ +# Locally computed sha256 7385ac202de6d6a1feffb2fd514600563133d9dfa7fb47be052de839abcc1d52 sngrep-v1.4.3.tar.gz +sha256 a3376abe20cca95a13ee88188ba5ba50425c93afc927cca018c50b0309ad21f9 4740f3341a99eaec105dee202a6fa7828212cdf1.patch diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 560872f..9dda158 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -14,8 +14,15 @@ SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf SNGREP_CONF_ENV += \ $(if $(BR2_STATIC_LIBS),LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`") -# our ncurses wchar support is not properly detected +# This patch fixes ncurses wchar detection +SNGREP_PATCH = \ + https://github.com/irontec/sngrep/pull/191/commits/4740f3341a99eaec105dee202a6fa7828212cdf1.patch + +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +SNGREP_CONF_OPTS += --enable-unicode +else SNGREP_CONF_OPTS += --disable-unicode +endif # openssl and gnutls can't be enabled at the same time. ifeq ($(BR2_PACKAGE_OPENSSL),y)