summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-11-12 14:02:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-13 16:11:27 +0000
commitd68e36973b8bbea9ef57c36e20a473d4e791cbc9 (patch)
tree99851b01bfa7cee75f2ffcb5acb01363ba07e38f
parentaeae9e45ddb7fd6ea7bdc4e7fde8d0b88796e418 (diff)
downloadpoky-d68e36973b8bbea9ef57c36e20a473d4e791cbc9.tar.gz
ncurses: poll() works, but only on Linux
ncurses does AC_TRY_RUN() to determine is poll() actually works. As that doesn't work in cross-compiles, we seed it with 'yes'. However, MinGW doesn't have a working poll(), so use a :linux override so that this only applies to Linux builds. The ncurses build now compiles but doesn't link in MinGW, which is a step forwards at least. (From OE-Core rev: f57de22c4a40cd9178f7726d544beca66384d25d) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index e32a6d12f1..a0ecd8a80b 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -18,6 +18,7 @@ SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https;branch=maste
18EXTRA_AUTORECONF = "-I m4" 18EXTRA_AUTORECONF = "-I m4"
19 19
20CACHED_CONFIGUREVARS = "cf_cv_func_nanosleep=yes" 20CACHED_CONFIGUREVARS = "cf_cv_func_nanosleep=yes"
21CACHED_CONFIGUREVARS:append:linux = " cf_cv_working_poll=yes"
21 22
22EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'" 23EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'"
23 24
@@ -98,10 +99,6 @@ ncurses_configure() {
98# patched autoconf213 to generate the configure script. This autoconf 99# patched autoconf213 to generate the configure script. This autoconf
99# is not available so that the shipped script will be used. 100# is not available so that the shipped script will be used.
100do_configure() { 101do_configure() {
101 # check does not work with cross-compiling and is generally
102 # broken because it requires stdin to be pollable (which is
103 # not the case for /dev/null redirections)
104 export cf_cv_working_poll=yes
105 #Remove ${includedir} from CPPFLAGS, need for cross compile 102 #Remove ${includedir} from CPPFLAGS, need for cross compile
106 sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS" 103 sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS"
107 104