qemu: fix -curses

d5d7e111 · Julien Muchembled · 3216cb3a · d5d7e111 · d5d7e111 · d5d7e111
Commit d5d7e111 authored Apr 12, 2021 by Julien Muchembled
8 changed files
--- a/component/ncurses/buildout.cfg
+++ b/component/ncurses/buildout.cfg
@@ -24,7 +24,12 @@ configure-options =
  --enable-rpath
 # tricky way to rerun with --enable-widec
 make-targets =
-  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h @@LOCATION@@/include/$i.h; done; ln -sf libncurses.so @@LOCATION@@/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
+  install && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
+post-install =
+  cd '%(location)s/include'
+  mv ncursesw/* .
+  rm -r ncurses ncursesw
+  ln -s . ncursesw
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
  LDCONFIG=/bin/echo

--- a/component/pypy/buildout.cfg
+++ b/component/pypy/buildout.cfg
@@ -49,7 +49,7 @@ configure-command =
  	cp -r include/pypy_*.h include/PyPy.h pypy/module/cpyext/include/* pypy/module/cpyext/parse/* \$(PREFIX)/include
  	cd pypy/goal && cp libpypy-c.so \$(PREFIX)/bin && cp pypy-c \$(PREFIX)/bin/pypy
 environment =
-  C_INCLUDE_PATH=${bzip2:location}/include:${gdbm:location}/include:${libexpat:location}/include:${ncurses:location}/include:${ncurses:location}/include/ncursesw:${openssl:location}/include:${sqlite3:location}/include:${zlib:location}/include
+  C_INCLUDE_PATH=${bzip2:location}/include:${gdbm:location}/include:${libexpat:location}/include:${ncurses:location}/include:${ncurses:location}/include:${openssl:location}/include:${sqlite3:location}/include:${zlib:location}/include
  LDFLAGS=-L${bzip2:location}/lib -L${gdbm:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig
--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -71,5 +71,5 @@ post-install = cd '${:prefix}' &&
 # which would otherwise load the system libmagic.so with ctypes
 environment =
  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
--- a/component/python3/buildout.cfg
+++ b/component/python3/buildout.cfg
@@ -48,7 +48,7 @@ pre-install = mkdir profile-opt
 # which would otherwise load the system libmagic.so with ctypes
 environment =
  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
  LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

 [python3.6]

--- a/component/qemu-kvm/buildout.cfg
+++ b/component/qemu-kvm/buildout.cfg
@@ -31,6 +31,7 @@ configure-options =
  --enable-linux-aio
  --enable-virtfs
  --disable-docs
+  --enable-curses
  --enable-vnc
  --enable-vnc-png
  --disable-vnc-jpeg

--- a/component/readline/buildout.cfg
+++ b/component/readline/buildout.cfg
@@ -48,11 +48,11 @@ patches =
  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006#71dc6ecce66d1489b96595f55d142a52
  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007#062a08ed60679d3c4878710b3d595b65
  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008#ee1c04072154826870848d8b218d7b04
-  ${:_profile_base_location_}/configure-ncurses.diff#c2bf0d0cb0ccd3d3c078ba124fffb7d2
+  ${:_profile_base_location_}/configure-ncurses.diff#db8187a92f19e0e9d2fe595ca7a0426f
 configure-options =
  --enable-multibyte
  --disable-static
 environment =
-  CPPFLAGS=-I${ncurses:location}/include/ncurses
+  CPPFLAGS=-I${ncurses:location}/include
  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
  PATH=${patch:location}/bin:%(PATH)s
--- a/component/readline/configure-ncurses.diff
+++ b/component/readline/configure-ncurses.diff
-diff -ur ../readline-6.3.orig/aclocal.m4 ./aclocal.m4
--- ../readline-6.3.orig/aclocal.m4	2013-10-21 00:37:50.000000000 +0200
-+++ ./aclocal.m4	2015-05-21 11:04:20.243591527 +0200
-@@ -958,10 +958,10 @@
- fi
- AC_CACHE_VAL(bash_cv_termcap_lib,
- [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
-  [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-    [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-+  [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
-+    [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-+      [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-         [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
-	    [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
- 	        bash_cv_termcap_lib=gnutermcap)])])])])])
- if test "X$_bash_needmsg" = "Xyes"; then
- AC_MSG_CHECKING(which library has the termcap functions)
-Only in ./: aclocal.m4~
-Only in ./: autom4te.cache
-diff -ur ../readline-6.3.orig/configure ./configure
--- ../readline-6.3.orig/configure	2013-03-13 15:14:53.000000000 +0100
-+++ ./configure	2015-05-21 11:29:48.157514191 +0200
-@@ -5793,6 +5793,45 @@
- if test "x$ac_cv_func_tgetent" = xyes; then :
-   bash_cv_termcap_lib=libc
- else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lncurses  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char tgetent ();
-+int
-+main ()
-+{
-+return tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ncurses_tgetent=yes
-+else
-+  ac_cv_lib_ncurses_tgetent=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
-+  bash_cv_termcap_lib=libncurses
-+else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
- $as_echo_n "checking for tgetent in -ltermcap... " >&6; }
- if ${ac_cv_lib_termcap_tgetent+:} false; then :
-@@ -5910,45 +5949,6 @@
- if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
-   bash_cv_termcap_lib=libcurses
- else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
-int
-main ()
-{
-return tgetent ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ncurses_tgetent=yes
-else
-  ac_cv_lib_ncurses_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
-  bash_cv_termcap_lib=libncurses
-else
-   bash_cv_termcap_lib=gnutermcap
- fi
- 
-@@ -6322,10 +6322,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-+  bash_cv_wcwidth_broken=no
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -6409,6 +6406,7 @@
+--- configure
+++ configure
+@@ -6856,6 +6856,7 @@
 #	*curses*|*termcap*|*termlib*)	;;
 #	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
 #	esac
@@ -132,15 +8,3 @@ diff -ur ../readline-6.3.orig/configure ./configure
 
 
 
-diff -ur ../readline-6.3.orig/configure.ac ./configure.ac
--- ../readline-6.3.orig/configure.ac	2014-02-11 23:12:39.000000000 +0100
-+++ ./configure.ac	2015-05-21 11:25:26.164610769 +0200
-@@ -222,6 +222,7 @@
- #	*curses*|*termcap*|*termlib*)	;;
- #	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
- #	esac
-+        SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB"
- 	
-         AC_SUBST(SHOBJ_CC)
-         AC_SUBST(SHOBJ_CFLAGS)
-Only in ./: configure.ac~
--- a/component/ruby/buildout.cfg
+++ b/component/ruby/buildout.cfg
@@ -20,7 +20,7 @@ configure-options =
  --with-out-ext=tk,tk/tkutil,win32,win32ole
 environment =
  PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
+  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
  LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl-1.0:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
  PKG_CONFIG_PATH=${libyaml:location}/lib/