summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <aheinecke@intevation.de>2014-05-21 14:06:16 (GMT)
committerAndre Heinecke <aheinecke@intevation.de>2014-05-21 14:06:16 (GMT)
commitad7ed6d0737e2b820c46eaf77f60398569f98532 (patch)
tree3c05f79bc444c95bfcff4127e033c501b2b9c30d
parentc4561d939df680845ba1ab9953c6c350668aa08c (diff)
downloadmxe-ad7ed6d0737e2b820c46eaf77f60398569f98532.zip
mxe-ad7ed6d0737e2b820c46eaf77f60398569f98532.tar.gz
mxe-ad7ed6d0737e2b820c46eaf77f60398569f98532.tar.bz2
Update package Polarssl
The patch was handed upstream as a pull request ( https://github.com/polarssl/polarssl/pull/104 ) so it is likely that it can be removed with the next update.
-rw-r--r--src/polarssl-1-cross-compile.patch27
-rw-r--r--src/polarssl.mk4
2 files changed, 29 insertions, 2 deletions
diff --git a/src/polarssl-1-cross-compile.patch b/src/polarssl-1-cross-compile.patch
new file mode 100644
index 0000000..90478ab
--- /dev/null
+++ b/src/polarssl-1-cross-compile.patch
@@ -0,0 +1,27 @@
+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 2e49f64..68f2a2f 100644
--- a/src/polarssl.mk
+++ b/src/polarssl.mk
@@ -3,8 +3,8 @@
PKG := polarssl
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.3.4
-$(PKG)_CHECKSUM := e43dc467e36ae2761ca2e4fa02c54f5771ee51a1
+$(PKG)_VERSION := 1.3.7
+$(PKG)_CHECKSUM := 4bfce7f2e833bead53ecd38098325a784ada5c39
$(PKG)_SUBDIR := polarssl-$($(PKG)_VERSION)
$(PKG)_FILE := polarssl-$($(PKG)_VERSION)-gpl.tgz
$(PKG)_URL := https://polarssl.org/download/$($(PKG)_FILE)