From 31993b329ee676d9f0bece894eee39b1243cfd90 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 10 Apr 2012 18:05:28 +0200 Subject: polarssl: new package Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../polarssl-shared-and-static-library.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/polarssl/polarssl-shared-and-static-library.patch (limited to 'package/polarssl/polarssl-shared-and-static-library.patch') diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch new file mode 100644 index 000000000..3ad3334c4 --- /dev/null +++ b/package/polarssl/polarssl-shared-and-static-library.patch @@ -0,0 +1,52 @@ +Allow both shared and static PolarSSL library + +By default, PolarSSL is built as a static library. If the option +USE_SHARED_POLARSSL_LIBRARY is set, then it is build as a shared +library. But there is no way of building both the shared and static +versions. + +This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON) +in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which +defaults to OFF). Both options can be manipulated independently. + +Signed-off-by: Thomas Petazzoni + +Index: polarssl-1.1.1/library/CMakeLists.txt +=================================================================== +--- polarssl-1.1.1.orig/library/CMakeLists.txt ++++ polarssl-1.1.1/library/CMakeLists.txt +@@ -1,4 +1,5 @@ + option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF) ++option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON) + + set(src + aes.c +@@ -40,17 +41,21 @@ + xtea.c + ) + +-if(NOT USE_SHARED_POLARSSL_LIBRARY) +- +-add_library(polarssl STATIC ${src}) +- +-else(NOT USE_SHARED_POLARSSL_LIBRARY) ++if(USE_SHARED_POLARSSL_LIBRARY) + + add_library(polarssl SHARED ${src}) + set_target_properties(polarssl PROPERTIES VERSION 1.1.1 SOVERSION 1) ++set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl) ++ ++endif(USE_SHARED_POLARSSL_LIBRARY) ++ ++if(USE_STATIC_POLARSSL_LIBRARY) ++ ++add_library(polarssl-static STATIC ${src}) ++set_target_properties(polarssl-static PROPERTIES OUTPUT_NAME polarssl) + +-endif(NOT USE_SHARED_POLARSSL_LIBRARY) ++endif(USE_STATIC_POLARSSL_LIBRARY) + +-install(TARGETS polarssl ++install(TARGETS polarssl polarssl-static + DESTINATION ${LIB_INSTALL_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -- cgit v1.2.3