aboutsummaryrefslogtreecommitdiff
path: root/contrib/depends/packages
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-09-24 10:34:59 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-09-24 10:34:59 -0500
commitcbec75ec314105a53d4962eb5b3adb28545aae17 (patch)
treefb7a769ae49a0126ba8612a448fc431816b03d4e /contrib/depends/packages
parentMerge pull request #5891 (diff)
parentdepends: attempt to fix readline (diff)
downloadmonero-cbec75ec314105a53d4962eb5b3adb28545aae17.tar.xz
Merge pull request #5892
ab2819a depends: attempt to fix readline (iDunk5400)
Diffstat (limited to 'contrib/depends/packages')
-rw-r--r--contrib/depends/packages/ncurses.mk8
-rw-r--r--contrib/depends/packages/readline.mk5
2 files changed, 9 insertions, 4 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