2323include $(APPDIR ) /Make.defs
2424
2525LIBSODIUM_VERSION = $(patsubst "% ",% ,$(strip $(CONFIG_LIBSODIUM_VERSION ) ) )
26- LIBSODIUM_URL ?= "https://github.com/jedisct1/libsodium/archive "
26+ LIBSODIUM_URL ?= "https://github.com/jedisct1/libsodium/releases/download/ $( LIBSODIUM_VERSION ) -RELEASE "
2727
28- LIBSODIUM_ZIP = $(LIBSODIUM_VERSION ) .zip
28+ LIBSODIUM_TARGZ = "libsodium- $(LIBSODIUM_VERSION ) .tar.gz"
2929
3030LIBSODIUM_UNPACKNAME = libsodium
31- UNPACK ?= unzip -q -o
31+ UNPACK ?= tar -xaf
3232
3333LIBSODIUM_UNPACKLIBDIR = $(LIBSODIUM_UNPACKNAME )$(DELIM ) src$(DELIM )$(LIBSODIUM_UNPACKNAME )
3434LIBSODIUM_UNPACKTESTDIR = $(LIBSODIUM_UNPACKNAME )$(DELIM ) test$(DELIM ) default
3535
36- CSRCS += $(shell find $(LIBSODIUM_UNPACKLIBDIR ) -name "* .c")
36+ CSRCS += $(shell if [ -d " $( LIBSODIUM_UNPACKLIBDIR ) " ]; then find " $(LIBSODIUM_UNPACKLIBDIR ) " -name "* .c"; fi )
3737CFLAGS += ${INCDIR_PREFIX}$(APPDIR ) /crypto/libsodium/libsodium/src/libsodium/include/sodium
3838CFLAGS += -DDEV_MODE -DCONFIGURED=1
3939CFLAGS += -Wno-unused-function -Wno-undef -Wno-unused-variable -Wno-deprecated-declarations \
@@ -48,13 +48,13 @@ PRIORITY = $(CONFIG_LIBSODIUM_TEST_PRIORITY)
4848STACKSIZE = $(CONFIG_LIBSODIUM_TEST_STACKSIZE )
4949endif
5050
51- $(LIBSODIUM_ZIP ) :
52- @echo " Downloading: $( LIBSODIUM_URL) /$( LIBSODIUM_ZIP ) "
53- $(Q ) $(call DOWNLOAD,$(LIBSODIUM_URL ) ,$(LIBSODIUM_ZIP ) )
51+ $(LIBSODIUM_TARGZ ) :
52+ @echo " Downloading: $( LIBSODIUM_URL) /$( LIBSODIUM_TARGZ ) "
53+ $(Q ) $(call DOWNLOAD,$(LIBSODIUM_URL ) ,$(LIBSODIUM_TARGZ ) )
5454
55- $(LIBSODIUM_UNPACKNAME ) : $(LIBSODIUM_ZIP )
56- @echo " Unpacking: $( LIBSODIUM_ZIP ) -> $( LIBSODIUM_UNPACKNAME) "
57- $(Q ) $(UNPACK ) $(LIBSODIUM_ZIP )
55+ $(LIBSODIUM_UNPACKNAME ) : $(LIBSODIUM_TARGZ )
56+ @echo " Unpacking: $( LIBSODIUM_TARGZ ) -> $( LIBSODIUM_UNPACKNAME) "
57+ $(Q ) $(UNPACK ) $(LIBSODIUM_TARGZ )
5858 $(Q ) mv $(LIBSODIUM_UNPACKNAME ) -$(LIBSODIUM_VERSION ) $(LIBSODIUM_UNPACKNAME )
5959 $(Q ) echo " Patching $( LIBSODIUM_UNPACKNAME) "
6060 $(Q ) patch -p1 -d $(LIBSODIUM_UNPACKNAME ) < 0001-fix-multiple-definition-bug-in-libsodium-test.patch
@@ -68,4 +68,4 @@ distclean::
6868 $(Q ) rm -rf $(LIBSODIUM_UNPACKNAME )
6969endif
7070
71- include $(APPDIR ) /Application.mk
71+ include $(APPDIR ) /Application.mk
0 commit comments