diff options
| -rw-r--r-- | meta/recipes-core/ncurses/files/codeset.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 18 |
2 files changed, 37 insertions, 7 deletions
diff --git a/meta/recipes-core/ncurses/files/codeset.patch b/meta/recipes-core/ncurses/files/codeset.patch new file mode 100644 index 00000000000..f7389f688b4 --- /dev/null +++ b/meta/recipes-core/ncurses/files/codeset.patch @@ -0,0 +1,26 @@ +diff --git a/aclocal.m4 b/aclocal.m4 +index c2c3ca4c..4b04c53d 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -51,7 +51,7 @@ dnl ==================== + dnl serial AM1 + dnl + dnl From Bruno Haible. +-AC_DEFUN([AM_LANGINFO_CODESET], ++AC_DEFUN([CF_LANGINFO_CODESET], + [ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include <langinfo.h>], +diff --git a/configure.in b/configure.in +index b71ad8ef..3f58682c 100644 +--- a/configure.in ++++ b/configure.in +@@ -924,7 +924,7 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS" + CF_SIGWINCH + + # Checks for CODESET support. +-AM_LANGINFO_CODESET ++CF_LANGINFO_CODESET + + # use these variables to work around a defect in gcc's fixincludes. + NCURSES_OK_WCHAR_T= diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index a56050df524..1a78802a9fa 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -12,7 +12,8 @@ BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ inherit autotools binconfig-disabled multilib_header pkgconfig -SRC_URI = "git://github.com/mirror/ncurses.git;protocol=https;branch=master" +SRC_URI = "git://github.com/mirror/ncurses.git;protocol=https;branch=master \ + file://codeset.patch" EXTRA_AUTORECONF = "-I m4" @@ -83,6 +84,9 @@ EXTRA_OECONF:append:class-nativesdk = " \ --with-chtype='long' \ --with-mmask-t='long'" +# Need to keep the aclocal.m4 +EXTRA_AUTORECONF += "--exclude=aclocal" + # Helper function for do_configure to allow multiple configurations # $1 the directory to run configure in # $@ the arguments to pass to configure @@ -98,16 +102,16 @@ ncurses_configure() { # patched autoconf213 to generate the configure script. This autoconf # is not available so that the shipped script will be used. do_configure() { + autotools_regenerate_configure + #Remove ${includedir} from CPPFLAGS, need for cross compile - sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS" + #sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS" # The --enable-pc-files requires PKG_CONFIG_LIBDIR existed mkdir -p ${PKG_CONFIG_LIBDIR} - ( cd ${S}; gnu-configize --force ) - ncurses_configure "narrowc" || \ - return 1 - ! ${ENABLE_WIDEC} || \ - ncurses_configure "widec" "--enable-widec" "--without-progs" + + ncurses_configure "narrowc" || return 1 + ! ${ENABLE_WIDEC} || ncurses_configure "widec" "--enable-widec" "--without-progs" } |