diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-11-04 02:49:52 +0400 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-11-04 02:49:52 +0400 |
| commit | e225465fe1b880bc4a8f468a4e508322297d8f64 (patch) | |
| tree | b69a3e0d720869c220f46be9851d2c05f27a226e /contrib/depends/packages | |
| parent | Merge pull request #6079 (diff) | |
| parent | Fix readline build (diff) | |
| download | monero-e225465fe1b880bc4a8f468a4e508322297d8f64.tar.xz | |
Merge pull request #6084
436e4c336 Fix readline build (Howard Chu)
Diffstat (limited to 'contrib/depends/packages')
| -rw-r--r-- | contrib/depends/packages/ncurses.mk | 10 | ||||
| -rw-r--r-- | contrib/depends/packages/readline.mk | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/depends/packages/ncurses.mk b/contrib/depends/packages/ncurses.mk index c3b16baab..1acf1faca 100644 --- a/contrib/depends/packages/ncurses.mk +++ b/contrib/depends/packages/ncurses.mk @@ -3,6 +3,7 @@ $(package)_version=6.1 $(package)_download_path=https://ftp.gnu.org/gnu/ncurses $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 +$(package)_patches=fallback.c define $(package)_set_vars $(package)_build_opts=CC="$($(package)_cc)" @@ -35,9 +36,8 @@ define $(package)_set_vars $(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" + $(package)_config_opts+=--with-default-terminfo-dir=/etc/_terminfo_ + $(package)_config_opts+=--with-terminfo-dirs=/etc/_terminfo_ $(pacakge)_config_opts+=--enable-database $(pacakge)_config_opts+=--enable-sp-funcs $(pacakge)_config_opts+=--disable-term-driver @@ -46,6 +46,10 @@ define $(package)_set_vars $(package)_build_opts=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC" endef +define $(package)_preprocess_cmds + cp $($(package)_patch_dir)/fallback.c ncurses +endef + define $(package)_config_cmds ./configure $($(package)_config_opts) endef diff --git a/contrib/depends/packages/readline.mk b/contrib/depends/packages/readline.mk index 8f234ab6a..29ae783a2 100644 --- a/contrib/depends/packages/readline.mk +++ b/contrib/depends/packages/readline.mk @@ -7,7 +7,7 @@ $(package)_dependencies=ncurses define $(package)_set_vars $(package)_build_opts=CC="$($(package)_cc)" - $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" + $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" LDFLAGS="-L$(host_prefix)/lib" $(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) |