summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2018-03-01 06:41:04 (GMT)
committerTony Theodore <tonyt@logyst.com>2018-03-06 10:31:04 (GMT)
commit8c20346885ad94c8432a311921e646ebe8047d14 (patch)
tree65c4fbd964e16e2ebe81d87e44b60693aee0ccba
parent3f7ee8aa9c32ab67400e712ba7d62772555c68f6 (diff)
downloadmxe-8c20346885ad94c8432a311921e646ebe8047d14.zip
mxe-8c20346885ad94c8432a311921e646ebe8047d14.tar.gz
mxe-8c20346885ad94c8432a311921e646ebe8047d14.tar.bz2
cpp-netlib: update and switch to release branch
-rw-r--r--src/cpp-netlib-1-fixes.patch9
-rw-r--r--src/cpp-netlib.mk15
2 files changed, 4 insertions, 20 deletions
diff --git a/src/cpp-netlib-1-fixes.patch b/src/cpp-netlib-1-fixes.patch
index 5df62e4..413fe6e 100644
--- a/src/cpp-netlib-1-fixes.patch
+++ b/src/cpp-netlib-1-fixes.patch
@@ -28,14 +28,7 @@ index 1111111..2222222 100644
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
set(CPP-NETLIB_HTTP_CLIENT_SRCS client.cpp)
-@@ -47,8 +49,12 @@ endif ()
- if (Boost_FOUND)
- target_link_libraries(cppnetlib-client-connections ${Boost_LIBRARIES})
- endif ()
-+if (WIN32)
-+ target_link_libraries(cppnetlib-client-connections ws2_32)
-+endif ()
- install(TARGETS cppnetlib-client-connections
+@@ -47,6 +48,7 @@ endif ()
EXPORT cppnetlibTargets
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
diff --git a/src/cpp-netlib.mk b/src/cpp-netlib.mk
index 6a7d1d5..f09e8c1 100644
--- a/src/cpp-netlib.mk
+++ b/src/cpp-netlib.mk
@@ -4,20 +4,11 @@ PKG := cpp-netlib
$(PKG)_WEBSITE := http://cpp-netlib.org/
$(PKG)_DESCR := Boost C++ Networking Library
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.11.2
-$(PKG)_CHECKSUM := 71953379c5a6fab618cbda9ac6639d87b35cab0600a4450a7392bc08c930f2b1
-$(PKG)_SUBDIR := cpp-netlib-$($(PKG)_VERSION)-final
-$(PKG)_FILE := cpp-netlib-$($(PKG)_VERSION)-final.tar.gz
-$(PKG)_URL := http://downloads.cpp-netlib.org/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_VERSION := 73d4024
+$(PKG)_CHECKSUM := 576f18cbad20ab123db68c72d1e541387a8b5d3b191698e44e2d96936a1f323b
+$(PKG)_GH_CONF := cpp-netlib/cpp-netlib/0.13-release
$(PKG)_DEPS := cc boost openssl
-define $(PKG)_UPDATE
- $(WGET) -q -O- 'http://cpp-netlib.org/' | \
- $(SED) -n 's,.*cpp-netlib-\([0-9][^"]*\)-final.tar.gz.*,\1,p' | \
- $(SORT) -V | \
- tail -1
-endef
-
define $(PKG)_BUILD
mkdir '$(1)/build'
cd '$(1)/build' && '$(TARGET)-cmake' .. \