cirros-testvm/src-cirros/buildroot-2015.05/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch

   1 Don't assume ncursesw headers are in ../usr/include/ncursesw/..
   2 On a pure build/system without legacy ncurses that may not be true.
   3 Since we're using pkg-config let it provide the correct include path.
   4
   5 Status: contacted one of the maintainers on sf.net
   6 (ticket submission closed to the public, no other way of contacting them).
   7
   8 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
   9
  10 diff -Nura procps-ng-3.3.10.orig/configure.ac procps-ng-3.3.10/configure.ac
  11 --- procps-ng-3.3.10.orig/configure.ac  2015-04-07 19:21:55.729819952 -0300
  12 +++ procps-ng-3.3.10/configure.ac       2015-04-07 19:32:09.511706653 -0300
  13 @@ -138,7 +138,8 @@
  14    ])
  15    AM_CONDITIONAL(WITH_NCURSES, true)
  16    if test "$enable_watch8bit" = yes; then
  17 -    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
  18 +    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"]
  19 +    [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [
  20        AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
  21                     [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
  22      ])
  23 @@ -148,6 +149,7 @@
  24  fi
  25  AC_SUBST([NCURSES_LIBS])
  26  AC_SUBST([WATCH_NCURSES_LIBS])
  27 +AC_SUBST([WATCH_NCURSES_CFLAGS])
  28
  29  AC_ARG_WITH([systemd],
  30    [AS_HELP_STRING([--with-systemd], [enable systemd support])],
  31 diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am
  32 --- procps-ng-3.3.10.orig/Makefile.am   2015-04-07 19:21:55.655817434 -0300
  33 +++ procps-ng-3.3.10/Makefile.am        2015-04-07 19:32:54.516238136 -0300
  34 @@ -83,6 +83,7 @@
  35  slabtop_LDADD = @NCURSES_LIBS@
  36  watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c $(top_srcdir)/lib/fileutils.c
  37  watch_LDADD = @WATCH_NCURSES_LIBS@
  38 +watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
  39  endif
  40
  41  if BUILD_SKILL
  42 diff -Nura procps-ng-3.3.10.orig/watch.c procps-ng-3.3.10/watch.c
  43 --- procps-ng-3.3.10.orig/watch.c       2015-04-07 19:21:55.707819203 -0300
  44 +++ procps-ng-3.3.10/watch.c    2015-04-07 19:22:27.323895083 -0300
  45 @@ -51,10 +51,8 @@
  46  #ifdef WITH_WATCH8BIT
  47  # include <wchar.h>
  48  # include <wctype.h>
  49 -# include <ncursesw/ncurses.h>
  50 -#else
  51 -# include <ncurses.h>
  52  #endif /* WITH_WATCH8BIT */
  53 +#include <ncurses.h>
  54
  55  #ifdef FORCE_8BIT
  56  # undef isprint