summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-07-21 20:09:08 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-07-21 20:09:08 (GMT)
commitf3b6f7d276065ecea7f89c642042fd8e50f69402 (patch)
treeb0078c7ff9052da2a27f887adcafd85abc584e94
parentd0dfa95fe7f18fc182eeb765a9a7e1f0efaea6d2 (diff)
parent47377bbc790adaf4863e3153faa963bb26b16261 (diff)
downloadmxe-f3b6f7d276065ecea7f89c642042fd8e50f69402.zip
mxe-f3b6f7d276065ecea7f89c642042fd8e50f69402.tar.gz
mxe-f3b6f7d276065ecea7f89c642042fd8e50f69402.tar.bz2
Merge pull request #436 from Intevation/polarssl-1.3.8
Update package Polarssl to 1.3.8
-rw-r--r--src/polarssl-1-cross-compile.patch27
-rw-r--r--src/polarssl.mk4
2 files changed, 2 insertions, 29 deletions
diff --git a/src/polarssl-1-cross-compile.patch b/src/polarssl-1-cross-compile.patch
deleted file mode 100644
index 90478ab..0000000
--- a/src/polarssl-1-cross-compile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From db48c07b89c049ffda07c7efdfabbd95b1e4213e Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Wed, 21 May 2014 10:20:14 +0000
-Subject: [PATCH] Fix symlink command for cross compiling
-
- Check for the host system to determine which command
- should be used to create a symlink
----
- tests/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 0460c63..975d497 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -95,7 +95,7 @@ if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
- file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/data_files" target)
-
- if (NOT EXISTS ${link})
-- if (UNIX)
-+ if (CMAKE_HOST_UNIX)
- set(command ln -s ${target} ${link})
- else()
- set(command cmd.exe /c mklink ${link} ${target})
---
-1.9.1
-
diff --git a/src/polarssl.mk b/src/polarssl.mk
index 68f2a2f..271439b 100644
--- a/src/polarssl.mk
+++ b/src/polarssl.mk
@@ -3,8 +3,8 @@
PKG := polarssl
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.3.7
-$(PKG)_CHECKSUM := 4bfce7f2e833bead53ecd38098325a784ada5c39
+$(PKG)_VERSION := 1.3.8
+$(PKG)_CHECKSUM := 82ed8ebcf3dd53621da5395b796fc0917083691d
$(PKG)_SUBDIR := polarssl-$($(PKG)_VERSION)
$(PKG)_FILE := polarssl-$($(PKG)_VERSION)-gpl.tgz
$(PKG)_URL := https://polarssl.org/download/$($(PKG)_FILE)