diff options
| author | Howard Chu <hyc@symas.com> | 2022-05-09 19:47:33 +0100 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2022-05-10 21:06:03 +0100 |
| commit | 5c27fd853f17d12ae6ab94cb01e3ced7cc710e1c (patch) | |
| tree | 0e5292ea87994cb9e47f48af3fa7ae29db3277d9 /contrib/depends/packages/ncurses.mk | |
| parent | Update randomx: fix Mac linking error (diff) | |
| download | monero-5c27fd853f17d12ae6ab94cb01e3ced7cc710e1c.tar.xz | |
depends: Package cleanup
All patching should be in _preprocess_cmd. config_cmd should just run
configure and nothing else before it, otherwise $PATH is broken when it runs.
Also remove redundant settings to configure, _autoconf already sets them.
We leave explicit AR_FLAGS settings because the builtin rule uses ARFLAGS,
and so would leave AR_FLAGS unset otherwise.
Diffstat (limited to 'contrib/depends/packages/ncurses.mk')
| -rw-r--r-- | contrib/depends/packages/ncurses.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/depends/packages/ncurses.mk b/contrib/depends/packages/ncurses.mk index 84087b60a..fb1d92c65 100644 --- a/contrib/depends/packages/ncurses.mk +++ b/contrib/depends/packages/ncurses.mk @@ -7,8 +7,7 @@ $(package)_patches=fallback.c define $(package)_set_vars $(package)_build_opts=CC="$($(package)_cc)" - $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" ARFLAGS=$($(package)_arflags) cf_cv_ar_flags="" - $(package)_config_env_darwin=RANLIB="$(host_prefix)/native/bin/$(host)-ranlib" AR="$(host_prefix)/native/bin/$(host)-ar" CC="$(host_prefix)/native/bin/$($(package)_cc)" + $(package)_config_env=cf_cv_ar_flags="" $(package)_config_opts=--prefix=$(host_prefix) $(package)_config_opts+=--disable-shared $(package)_config_opts+=--with-build-cc=gcc @@ -51,7 +50,7 @@ define $(package)_preprocess_cmds endef define $(package)_config_cmds - ./configure $($(package)_config_opts) + $($(package)_autoconf) endef define $(package)_build_cmds |