From 684bfca7654573a92b22d1c3e45e95b680efa4cf Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 26 Sep 2023 09:35:56 +0200 Subject: [PATCH] depends: move sodium to packages --- contrib/depends/packages/packages.mk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index 6bc5a6fa1..9e8873bc1 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -1,4 +1,4 @@ -packages:=boost openssl zeromq expat unbound +packages:=boost openssl zeromq expat unbound sodium # ccache is useless in gitian builds ifneq ($(GITIAN),1) @@ -9,26 +9,25 @@ hardware_packages := hidapi protobuf libusb hardware_native_packages := native_protobuf android_native_packages = android_ndk $(hardware_native_packages) -android_packages = ncurses readline sodium protobuf +android_packages = ncurses readline protobuf darwin_native_packages = $(hardware_native_packages) -darwin_packages = ncurses readline sodium $(hardware_packages) +darwin_packages = ncurses readline $(hardware_packages) # not really native... freebsd_native_packages = freebsd_base $(hardware_native_packages) -freebsd_packages = ncurses readline sodium protobuf libusb +freebsd_packages = ncurses readline protobuf libusb -linux_packages = eudev ncurses readline sodium $(hardware_packages) +linux_packages = eudev ncurses readline $(hardware_packages) linux_native_packages = $(hardware_native_packages) ifeq ($(build_tests),ON) packages += gtest endif -mingw32_packages = sodium $(hardware_packages) +mingw32_packages = $(hardware_packages) mingw32_native_packages = $(hardware_native_packages) ifneq ($(build_os),darwin) darwin_native_packages += darwin_sdk native_clang native_cctools native_libtapi endif -