summaryrefslogtreecommitdiffstats
path: root/src/libsodium.mk
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-12-06 14:06:41 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-12-06 14:06:41 (GMT)
commitb3bbae77f0bbc760f14da05c804d23af1c52016a (patch)
treea75f35450e9abdd25b9cd59d3f82d6fa454023ac /src/libsodium.mk
parentcb213793042b3c60d0c9b6ce8821854f570721ea (diff)
downloadmxe-b3bbae77f0bbc760f14da05c804d23af1c52016a.zip
mxe-b3bbae77f0bbc760f14da05c804d23af1c52016a.tar.gz
mxe-b3bbae77f0bbc760f14da05c804d23af1c52016a.tar.bz2
libsodium: update 1.0.6 --> 1.0.15, use GH_CONF, and build out-of-source
Diffstat (limited to 'src/libsodium.mk')
-rw-r--r--src/libsodium.mk22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/libsodium.mk b/src/libsodium.mk
index 8028f1a..7a7c57d 100644
--- a/src/libsodium.mk
+++ b/src/libsodium.mk
@@ -3,24 +3,14 @@
PKG := libsodium
$(PKG)_WEBSITE := https://download.libsodium.org/doc/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.0.6
-$(PKG)_CHECKSUM := 940d03ea7d2caa7940e24564bf6d9f66d6edd1df1e0111ff8e3655f3b864fb59
-$(PKG)_SUBDIR := libsodium-$($(PKG)_VERSION)
-$(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)_VERSION := 1.0.15
+$(PKG)_CHECKSUM := fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
+$(PKG)_GH_CONF := jedisct1/libsodium/releases
$(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 '$(1)' -j 1 install
+ $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install
endef