From 4053c61636a5ee545c8130bcedea12d77b85de4c Mon Sep 17 00:00:00 2001 From: Darshit Shah Date: Wed, 25 Oct 2017 14:53:54 +0200 Subject: [PATCH] On newer systems -ltinfo needs to be explicitly added to the link flags --- src/misc/bochs-2.6.2-build.sh | 1 + src/misc/bochs-2.6.2-link-tinfo.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/misc/bochs-2.6.2-link-tinfo.patch diff --git a/src/misc/bochs-2.6.2-build.sh b/src/misc/bochs-2.6.2-build.sh index 7dc85fe..ce90a71 100755 --- a/src/misc/bochs-2.6.2-build.sh +++ b/src/misc/bochs-2.6.2-build.sh @@ -18,6 +18,7 @@ cat $PINTOSDIR/src/misc/bochs-2.6.2-jitter-plus-segv.patch | patch -p1 cat $PINTOSDIR/src/misc/bochs-2.6.2-xrandr-pkgconfig.patch | patch -p1 cat $PINTOSDIR/src/misc/bochs-2.6.2-banner-stderr.patch | patch -p1 cat $PINTOSDIR/src/misc/bochs-2.6.2-block-device-check.patch | patch -p1 +cat $PINTOSDIR/src/misc/bochs-2.6.2-link-tinfo.patch | patch -p1 CFGOPTS="--with-x --with-x11 --with-term --with-nogui --prefix=$DSTDIR" mkdir plain && cd plain && diff --git a/src/misc/bochs-2.6.2-link-tinfo.patch b/src/misc/bochs-2.6.2-link-tinfo.patch new file mode 100644 index 0000000..e83047e --- /dev/null +++ b/src/misc/bochs-2.6.2-link-tinfo.patch @@ -0,0 +1,22 @@ +diff --git i/configure w/configure +index be5e0a5..99b2e14 100755 +--- i/configure ++++ w/configure +@@ -24739,7 +24739,7 @@ if ${ac_cv_lib_ncurses_mvaddch+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lncurses $LIBS" ++LIBS="-lncurses -ltinfo $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -24770,7 +24770,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_mvaddch" >&5 + $as_echo "$ac_cv_lib_ncurses_mvaddch" >&6; } + if test "x$ac_cv_lib_ncurses_mvaddch" = xyes; then : +- GUI_LINK_OPTS_TERM='-lncurses' ++ GUI_LINK_OPTS_TERM='-lncurses -ltinfo' + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mvaddch in -ltermlib" >&5 -- 2.30.2