Merge pull request #5892

ab2819a depends: attempt to fix readline (iDunk5400)

3 files changed, 11 insertions, 5 deletions

diff --git a/contrib/depends/packages/ncurses.mk b/contrib/depends/packages/ncurses.mk
index 4e06c00d9..c3b16baab 100644
--- a/contrib/depends/packages/ncurses.mk
+++ b/contrib/depends/packages/ncurses.mk
@@ -21,6 +21,7 @@ define $(package)_set_vars
   $(package)_config_opts+=--without-tests
   $(package)_config_opts+=--without-tack
   $(package)_config_opts+=--without-manpages
+  $(package)_config_opts+=--with-termlib=tinfo
   $(package)_config_opts+=--disable-tic-depends
   $(package)_config_opts+=--disable-big-strings
   $(package)_config_opts+=--disable-ext-colors
@@ -30,15 +31,16 @@ define $(package)_set_vars
   $(pacakge)_config_opts+=--without-pthread
   $(pacakge)_config_opts+=--disable-rpath
   $(pacakge)_config_opts+=--disable-colorfgbg
-  $(pacakge)_config_opts+=--disable-ext-colors
   $(pacakge)_config_opts+=--disable-ext-mouse
   $(pacakge)_config_opts+=--disable-symlinks
   $(pacakge)_config_opts+=--enable-warnings
   $(pacakge)_config_opts+=--enable-assertions
   $(pacakge)_config_opts+=--disable-home-terminfo
+  $(package)_config_opts+=--with-default-terminfo-dir=/etc/terminfo
+  $(package)_config_opts+=--with-terminfo-dirs="/etc/terminfo:/lib/terminfo:/usr/share/terminfo"
   $(pacakge)_config_opts+=--enable-database
   $(pacakge)_config_opts+=--enable-sp-funcs
-  $(pacakge)_config_opts+=--enable-term-driver
+  $(pacakge)_config_opts+=--disable-term-driver
   $(pacakge)_config_opts+=--enable-interop
   $(pacakge)_config_opts+=--enable-widec
   $(package)_build_opts=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC"
@@ -53,6 +55,6 @@ define $(package)_build_cmds
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) install DESTDIR=$($(package)_staging_dir)
+  $(MAKE) install.libs DESTDIR=$($(package)_staging_dir)
 endef
 
diff --git a/contrib/depends/packages/readline.mk b/contrib/depends/packages/readline.mk
index 0e2100749..8f234ab6a 100644
--- a/contrib/depends/packages/readline.mk
+++ b/contrib/depends/packages/readline.mk
@@ -6,7 +6,10 @@ $(package)_sha256_hash=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078
 $(package)_dependencies=ncurses
 
 define $(package)_set_vars
-  $(package)_config_opts=--prefix=$(host_prefix)
+  $(package)_build_opts=CC="$($(package)_cc)"
+  $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
+  $(package)_config_env_darwin=RANLIB="$(host_prefix)/native/bin/x86_64-apple-darwin11-ranlib" AR="$(host_prefix)/native/bin/x86_64-apple-darwin11-ar" CC="$(host_prefix)/native/bin/$($(package)_cc)"
+  $(package)_config_opts+=--prefix=$(host_prefix)
   $(package)_config_opts+=--exec-prefix=$(host_prefix)
   $(package)_config_opts+=--host=$(HOST)
   $(package)_config_opts+=--disable-shared --with-curses
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index 0c0225cbe..3be748ae7 100644
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -22,7 +22,8 @@ SET(LRELEASE_PATH @prefix@/native/bin CACHE FILEPATH "path to lrelease" FORCE)
 
 SET(Readline_ROOT_DIR @prefix@)
 SET(Readline_INCLUDE_DIR @prefix@/include)
-SET(Termcap_LIBRARY @prefix@/lib/libncurses.a)
+SET(Readline_LIBRARY @prefix@/lib/libreadline.a)
+SET(Termcap_LIBRARY @prefix@/lib/libtinfo.a)
 
 SET(LIBUNWIND_INCLUDE_DIR @prefix@/include)
 SET(LIBUNWIND_LIBRARIES @prefix@/lib/libunwind.a)