| Message ID | 20170607155316.25646-1-aduskett@codeblue.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
Hello, On Wed, 7 Jun 2017 11:53:16 -0400, Adam Duskett wrote: > 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 <wctypes.h> instead of > <ncursesw/ncurses.h> if unicode is supported. > > Signed-off-by: Adam Duskett <aduskett@codeblue.com> > --- > Changes v1 -> v2: > - Added # Locally computed header to sngrep.hash Applied to master, after fixing the commit log, which wasn't appropriate anymore. Thanks! Thomas
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)
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 <wctypes.h> instead of <ncursesw/ncurses.h> if unicode is supported. Signed-off-by: Adam Duskett <aduskett@codeblue.com> --- 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(-)