From 71130788178fbe5dcfddc7d703d3257cadc1b14f Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 20 Feb 2014 17:30:30 +0100
Subject: [PATCH] Fix polarssl compilation nightmare

---
 submodules/build/builders.d/polarssl.mk | 16 ++++++----------
 submodules/externals/polarssl           |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/submodules/build/builders.d/polarssl.mk b/submodules/build/builders.d/polarssl.mk
index 26929cfc2..a3e476a4e 100644
--- a/submodules/build/builders.d/polarssl.mk
+++ b/submodules/build/builders.d/polarssl.mk
@@ -7,20 +7,16 @@ BUILD_DIR=$(BUILDER_BUILD_DIR)
 $(SRC_DIR)/$(polarssl_dir)/configure:
 	cd $(SRC_DIR)/$(polarssl_dir) && ./autogen.sh
 
-$(SRC_DIR)/$(polarssl_dir)/Makefile: $(SRC_DIR)/$(polarssl_dir)/configure
+$(BUILD_DIR)/$(polarssl_dir)/Makefile: $(SRC_DIR)/$(polarssl_dir)/configure
 	mkdir -p $(BUILD_DIR)/$(polarssl_dir)
-	cd $(BUILD_DIR)/$(polarssl_dir)/ \
+	cd $(BUILD_DIR)/$(polarssl_dir) \
 	&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(SRC_DIR)/build/$(config_site) \
 	$(SRC_DIR)/$(polarssl_dir)/configure --prefix=$(prefix) --host=$(host) ${library_mode}  
 
-update-tree:  $(SRC_DIR)/$(polarssl_dir)/Makefile
-	mkdir -p $(BUILD_DIR)/$(polarssl_dir)
-	cd $(BUILD_DIR)/$(polarssl_dir)/ && \
-	rsync -rvLpgoc --exclude ".git" $(SRC_DIR)/$(polarssl_dir)/ .
-
-build-polarssl: update-tree
-	host_alias=$(host) && . /$(SRC_DIR)/build/$(config_site) && \
-	cd $(BUILD_DIR)/$(polarssl_dir) && make && make install
+build-polarssl: $(BUILD_DIR)/$(polarssl_dir)/Makefile
+	cd $(BUILD_DIR)/${polarssl_dir} && \
+	host_alias=$(host) && . $(SRC_DIR)/build/$(config_site) && \
+	make && make install
 
 clean-polarssl:
 	-cd $(BUILD_DIR)/$(polarssl_dir) && make clean
diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl
index 3ba24a4ea..a574428c1 160000
--- a/submodules/externals/polarssl
+++ b/submodules/externals/polarssl
@@ -1 +1 @@
-Subproject commit 3ba24a4ea0b53577415f6ab3076a053263ec2daf
+Subproject commit a574428c12529de7d57ffe227b26890118bf85b7