sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto/libsodium: fix libsodium compilation problem

Browse Source 
(1)fix unable to pull source code
(2)fix compile warning
Signed-off-by: makejian <makejian@xiaomi.com>
This commit is contained in:
makejian 2023-08-11 16:53:44 +08:00 committed by Xiang Xiao
parent 323c16a5fb
commit 024a7eeec3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/libsodium/Makefile
View File

@ -21,7 +21,7 @@
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
LIBSODIUM_VERSION = $(patsubst "%",%,$(strip $(CONFIG_LIBSODIUM_VERSION))) 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 LIBSODIUM_ZIP = $(LIBSODIUM_VERSION).zip
@ -33,7 +33,8 @@ LIBSODIUM_UNPACKTESTDIR = $(LIBSODIUM_UNPACKNAME)$(DELIM)test$(DELIM)default
CSRCS += $(shell find $(LIBSODIUM_UNPACKLIBDIR) -name "*.c") CSRCS += $(shell find $(LIBSODIUM_UNPACKLIBDIR) -name "*.c")
CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/libsodium/libsodium/src/libsodium/include/sodium 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),) ifneq ($(CONFIG_LIBSODIUM_TEST),)
MODULE = $(CONFIG_LIBSODIUM_TEST) MODULE = $(CONFIG_LIBSODIUM_TEST)
@ -61,7 +62,7 @@ ifeq ($(wildcard $(LIBSODIUM_UNPACKNAME)/.git),)
context:: $(LIBSODIUM_UNPACKNAME) context:: $(LIBSODIUM_UNPACKNAME)
distclean:: distclean::
$(Q) rm -rf $(LIBSODIUM_UNPACKNAME) $(Q) rm -rf $(LIBSODIUM_UNPACKNAME)
endif endif
include $(APPDIR)/Application.mk include $(APPDIR)/Application.mk