NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
d0774df091
kumquat-buildroot/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch

58 lines
2.2 KiB
Diff
Raw Normal View History

procps-ng: fix/patch wrong ncursesw headers assumption The configure script/code assumes ncursesw headers live in /usr/include/ncursesw. That's a distribution-ism where they want to have both versions for ABI/API compatibility, but not the case for embedded where that's not a concern. Hence kill the hard-coding and use pkg-config to find this out instead of the half-made effort about it. Fixes: http://autobuild.buildroot.net/results/97d/97dc7f238457609c861c24f81b556973f5dec9c1/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-08 00:50:06 +02:00
Don't assume ncursesw headers are in ../usr/include/ncursesw/..
On a pure build/system without legacy ncurses that may not be true.
Since we're using pkg-config let it provide the correct include path.
Status: contacted one of the maintainers on sf.net
(ticket submission closed to the public, no other way of contacting them).
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
package/procps-ng: bump version to 3.3.11 to fix musl build Rebased 0002-use-pkgconfig-for-ncursesw-cflags.patch The build error has not yet been found by the autobuilders: watch.c:564:37: error: request for member ‘chars’ in something not a structure or union exit_early = (wchar_t) c != oldc.chars[0]; ^ watch.c:573:5: error: unknown type name ‘cchar_t’ cchar_t oldc; Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-31 13:04:16 +01:00
[Bernd: Rebased for version 3.3.11]
procps-ng: fix/patch wrong ncursesw headers assumption The configure script/code assumes ncursesw headers live in /usr/include/ncursesw. That's a distribution-ism where they want to have both versions for ABI/API compatibility, but not the case for embedded where that's not a concern. Hence kill the hard-coding and use pkg-config to find this out instead of the half-made effort about it. Fixes: http://autobuild.buildroot.net/results/97d/97dc7f238457609c861c24f81b556973f5dec9c1/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-08 00:50:06 +02:00
diff -Nura procps-ng-3.3.10.orig/configure.ac procps-ng-3.3.10/configure.ac
--- procps-ng-3.3.10.orig/configure.ac 2015-04-07 19:21:55.729819952 -0300
+++ procps-ng-3.3.10/configure.ac 2015-04-07 19:32:09.511706653 -0300
@@ -138,7 +138,8 @@
])
AM_CONDITIONAL(WITH_NCURSES, true)
if test "$enable_watch8bit" = yes; then
- PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
+ PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"]
+ [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [
AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
[AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
])
@@ -148,6 +149,7 @@
fi
AC_SUBST([NCURSES_LIBS])
AC_SUBST([WATCH_NCURSES_LIBS])
+AC_SUBST([WATCH_NCURSES_CFLAGS])
AC_ARG_WITH([systemd],
[AS_HELP_STRING([--with-systemd], [enable systemd support])],
diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am
--- procps-ng-3.3.10.orig/Makefile.am 2015-04-07 19:21:55.655817434 -0300
+++ procps-ng-3.3.10/Makefile.am 2015-04-07 19:32:54.516238136 -0300
package/procps-ng: bump version to 3.3.11 to fix musl build Rebased 0002-use-pkgconfig-for-ncursesw-cflags.patch The build error has not yet been found by the autobuilders: watch.c:564:37: error: request for member ‘chars’ in something not a structure or union exit_early = (wchar_t) c != oldc.chars[0]; ^ watch.c:573:5: error: unknown type name ‘cchar_t’ cchar_t oldc; Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-31 13:04:16 +01:00
@@ -97,6 +97,7 @@
slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
package/procps-ng: Bump to version 3.3.12 Signed-off-by: Jeroen Roovers <jer@airfi.aero> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-08-31 10:18:05 +02:00
watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
procps-ng: fix/patch wrong ncursesw headers assumption The configure script/code assumes ncursesw headers live in /usr/include/ncursesw. That's a distribution-ism where they want to have both versions for ABI/API compatibility, but not the case for embedded where that's not a concern. Hence kill the hard-coding and use pkg-config to find this out instead of the half-made effort about it. Fixes: http://autobuild.buildroot.net/results/97d/97dc7f238457609c861c24f81b556973f5dec9c1/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-08 00:50:06 +02:00
+watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
package/procps-ng: bump version to 3.3.11 to fix musl build Rebased 0002-use-pkgconfig-for-ncursesw-cflags.patch The build error has not yet been found by the autobuilders: watch.c:564:37: error: request for member ‘chars’ in something not a structure or union exit_early = (wchar_t) c != oldc.chars[0]; ^ watch.c:573:5: error: unknown type name ‘cchar_t’ cchar_t oldc; Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-01-31 13:04:16 +01:00
top_top_SOURCES = \
top/top.h \
top/top.c \
procps-ng: fix/patch wrong ncursesw headers assumption The configure script/code assumes ncursesw headers live in /usr/include/ncursesw. That's a distribution-ism where they want to have both versions for ABI/API compatibility, but not the case for embedded where that's not a concern. Hence kill the hard-coding and use pkg-config to find this out instead of the half-made effort about it. Fixes: http://autobuild.buildroot.net/results/97d/97dc7f238457609c861c24f81b556973f5dec9c1/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-08 00:50:06 +02:00
diff -Nura procps-ng-3.3.10.orig/watch.c procps-ng-3.3.10/watch.c
--- procps-ng-3.3.10.orig/watch.c 2015-04-07 19:21:55.707819203 -0300
+++ procps-ng-3.3.10/watch.c 2015-04-07 19:22:27.323895083 -0300
@@ -51,10 +51,8 @@
#ifdef WITH_WATCH8BIT
# include <wchar.h>
# include <wctype.h>
-# include <ncursesw/ncurses.h>
-#else
-# include <ncurses.h>
#endif /* WITH_WATCH8BIT */
+#include <ncurses.h>
#ifdef FORCE_8BIT
# undef isprint
Reference in New Issue Copy Permalink