From 9c9b4f234433db4bcf7eec0b2e7e88178c45201f Mon Sep 17 00:00:00 2001 From: makejian Date: Fri, 11 Aug 2023 16:53:44 +0800 Subject: [PATCH] crypto/libsodium: fix libsodium compilation problem (1)fix unable to pull source code (2)fix compile warning Signed-off-by: makejian --- crypto/libsodium/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crypto/libsodium/Makefile b/crypto/libsodium/Makefile index c2014c2265..aa74f888cf 100644 --- a/crypto/libsodium/Makefile +++ b/crypto/libsodium/Makefile @@ -21,7 +21,7 @@ include $(APPDIR)/Make.defs LIBSODIUM_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LIBSODIUM_VERSION))) -LIBSODIUM_URL ?= "https://github.com/jedisct1/libsodium/archive/refs/tags/$(LIBSODIUM_VERSION).zip" +LIBSODIUM_URL ?= "https://github.com/jedisct1/libsodium/archive" LIBSODIUM_ZIP = $(LIBSODIUM_VERSION).zip @@ -33,7 +33,8 @@ LIBSODIUM_UNPACKTESTDIR = $(LIBSODIUM_UNPACKNAME)$(DELIM)test$(DELIM)default CSRCS += $(shell find $(LIBSODIUM_UNPACKLIBDIR) -name "*.c") CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/libsodium/libsodium/src/libsodium/include/sodium -CFLAGS += -Wno-unused-function -Wno-undef -Wno-unused-variable -Wno-deprecated-declarations +CFLAGS += -Wno-unused-function -Wno-undef -Wno-unused-variable -Wno-deprecated-declarations \ + -Wno-shadow ifneq ($(CONFIG_LIBSODIUM_TEST),) MODULE = $(CONFIG_LIBSODIUM_TEST) @@ -61,7 +62,7 @@ ifeq ($(wildcard $(LIBSODIUM_UNPACKNAME)/.git),) context:: $(LIBSODIUM_UNPACKNAME) distclean:: - $(Q) rm -rf $(LIBSODIUM_UNPACKNAME) + $(Q) rm -rf $(LIBSODIUM_UNPACKNAME) endif include $(APPDIR)/Application.mk \ No newline at end of file