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/sodium.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/sodium.mk')
| -rw-r--r-- | contrib/depends/packages/sodium.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk index 51f08a319..87b34599e 100644 --- a/contrib/depends/packages/sodium.mk +++ b/contrib/depends/packages/sodium.mk @@ -8,15 +8,16 @@ $(package)_patches=disable-glibc-getrandom-getentropy.patch fix-whitespace.patch define $(package)_set_vars $(package)_config_opts=--enable-static --disable-shared $(package)_config_opts+=--prefix=$(host_prefix) -$(package)_config_opts_android=RANLIB=$($(package)_ranlib) AR=$($(package)_ar) CC=$($(package)_cc) -$(package)_config_opts_darwin=RANLIB="$(host_prefix)/native/bin/$(host)-ranlib" AR="$(host_prefix)/native/bin/$(host)-ar" CC="$(host_prefix)/native/bin/$($(package)_cc)" endef -define $(package)_config_cmds +define $(package)_preprocess_cmds patch -p1 < $($(package)_patch_dir)/disable-glibc-getrandom-getentropy.patch &&\ - ./autogen.sh &&\ - patch -p1 < $($(package)_patch_dir)/fix-whitespace.patch &&\ - $($(package)_autoconf) $($(package)_config_opts) AR_FLAGS=$($(package)_arflags) + autoconf &&\ + patch -p1 < $($(package)_patch_dir)/fix-whitespace.patch +endef + +define $(package)_config_cmds + $($(package)_autoconf) AR_FLAGS=$($(package)_arflags) endef define $(package)_build_cmds |