diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk index 87b34599e..a74b15095 100644 --- a/contrib/depends/packages/sodium.mk +++ b/contrib/depends/packages/sodium.mk @@ -3,7 +3,7 @@ $(package)_version=1.0.18 $(package)_download_path=https://download.libsodium.org/libsodium/releases/ $(package)_file_name=libsodium-$($(package)_version).tar.gz $(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 -$(package)_patches=disable-glibc-getrandom-getentropy.patch fix-whitespace.patch +$(package)_patches=disable-glibc-getrandom-getentropy.patch define $(package)_set_vars $(package)_config_opts=--enable-static --disable-shared @@ -12,8 +12,7 @@ endef define $(package)_preprocess_cmds patch -p1 < $($(package)_patch_dir)/disable-glibc-getrandom-getentropy.patch &&\ - autoconf &&\ - patch -p1 < $($(package)_patch_dir)/fix-whitespace.patch + autoconf endef define $(package)_config_cmds diff --git a/contrib/depends/patches/sodium/fix-whitespace.patch b/contrib/depends/patches/sodium/fix-whitespace.patch deleted file mode 100644 index c3d3af0b4..000000000 --- a/contrib/depends/patches/sodium/fix-whitespace.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index b29f769..ca008ae 100755 ---- a/configure -+++ b/configure -@@ -591,7 +591,7 @@ MAKEFLAGS= - PACKAGE_NAME='libsodium' - PACKAGE_TARNAME='libsodium' - PACKAGE_VERSION='1.0.18' --PACKAGE_STRING='libsodium 1.0.18' -+PACKAGE_STRING='libsodium' - PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues' - PACKAGE_URL='https://github.com/jedisct1/libsodium' -