Merge pull request #2003 from tonytheodore/libsodium

libsodium: update 1.0.6 --> 1.0.15, use GH_CONF, and build out-of-source

src/libsodium.mk

@@ -3,24 +3,14 @@
 PKG             := libsodium
 $(PKG)_WEBSITE  := https://download.libsodium.org/doc/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.6
+$(PKG)_VERSION  := 1.0.15
-$(PKG)_CHECKSUM := 940d03ea7d2caa7940e24564bf6d9f66d6edd1df1e0111ff8e3655f3b864fb59
+$(PKG)_CHECKSUM := fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
-$(PKG)_SUBDIR   := libsodium-$($(PKG)_VERSION)
+$(PKG)_GH_CONF  := jedisct1/libsodium/releases
-$(PKG)_FILE     := libsodium-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://download.libsodium.org/libsodium/releases/old/unsupported/$($(PKG)_FILE)
-$(PKG)_URL_2    := https://github.com/jedisct1/libsodium/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://download.libsodium.org/libsodium/releases/' | \
-    $(SED) -n 's,.*libsodium-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    grep -v mingw | \
-    tail -1
-endef
-
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
         $(MXE_CONFIGURE_OPTS)
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef