mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-12-14 15:53:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

polarssl: bump to version 1.2.0

Browse Source 
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2012-11-17 06:42:27 +00:00 committed by Peter Korsgaard
parent 7451db3d3a
commit b5a34e750f
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/polarssl/polarssl-shared-and-static-library.patch
View File

@ -9,21 +9,22 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
defaults to OFF). Both options can be manipulated independently. defaults to OFF). Both options can be manipulated independently.
[Gustavo: update for polarssl 1.2.0]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Index: polarssl-1.1.1/library/CMakeLists.txt diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMakeLists.txt
=================================================================== --- polarssl-1.2.0.orig/library/CMakeLists.txt 2012-11-15 15:01:58.239248830 -0300
--- polarssl-1.1.1.orig/library/CMakeLists.txt +++ polarssl-1.2.0/library/CMakeLists.txt 2012-11-15 15:00:10.310806353 -0300
+++ polarssl-1.1.1/library/CMakeLists.txt
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF) option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF)
+option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON) +option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON)
set(src set(src
aes.c aes.c
@@ -40,17 +41,21 @@ @@ -50,19 +51,23 @@
xtea.c set(libs ws2_32)
) endif(WIN32)
-if(NOT USE_SHARED_POLARSSL_LIBRARY) -if(NOT USE_SHARED_POLARSSL_LIBRARY)
- -
@ -33,7 +34,7 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
+if(USE_SHARED_POLARSSL_LIBRARY) +if(USE_SHARED_POLARSSL_LIBRARY)
add_library(polarssl SHARED ${src}) add_library(polarssl SHARED ${src})
set_target_properties(polarssl PROPERTIES VERSION 1.1.3 SOVERSION 1) set_target_properties(polarssl PROPERTIES VERSION 1.2.0 SOVERSION 2)
+set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl) +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
+ +
+endif(USE_SHARED_POLARSSL_LIBRARY) +endif(USE_SHARED_POLARSSL_LIBRARY)
@ -46,6 +47,8 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
-endif(NOT USE_SHARED_POLARSSL_LIBRARY) -endif(NOT USE_SHARED_POLARSSL_LIBRARY)
+endif(USE_STATIC_POLARSSL_LIBRARY) +endif(USE_STATIC_POLARSSL_LIBRARY)
target_link_libraries(polarssl ${libs})
-install(TARGETS polarssl -install(TARGETS polarssl
+install(TARGETS polarssl polarssl-static +install(TARGETS polarssl polarssl-static
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}

6
package/polarssl/polarssl.mk
View File

@ -1,5 +1,5 @@
POLARSSL_SITE = http://polarssl.org/code/releases/ POLARSSL_SITE = https://polarssl.org/download
POLARSSL_VERSION = 1.1.4 POLARSSL_VERSION = 1.2.0
POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
POLARSSL_CONF_OPT = \ POLARSSL_CONF_OPT = \
-DUSE_SHARED_POLARSSL_LIBRARY=ON \ -DUSE_SHARED_POLARSSL_LIBRARY=ON \
@ -8,6 +8,8 @@ POLARSSL_CONF_OPT = \
-DBUILD_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF) -DBUILD_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF)
POLARSSL_INSTALL_STAGING = YES POLARSSL_INSTALL_STAGING = YES
POLARSSL_LICENSE = GPLv2
POLARSSL_LICENSE_FILES = LICENSE
$(eval $(cmake-package)) $(eval $(cmake-package))