aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2017-08-02 17:29:13 +0200
committerpacien2017-08-02 17:29:13 +0200
commitf53478b6c5b5704763013635b5e9630a3b72b79b (patch)
treeeb5b285fb91942d7e77853c8119fee05edcc06a5
parent75fb7ba17f5977b146f166412eaf39705a5f4e73 (diff)
downloadtincapp-f53478b6c5b5704763013635b5e9630a3b72b79b.tar.gz
Update libressl to v2.5.5 and adjust compilation options
-rw-r--r--app/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ae5d6e2..8620070 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -18,16 +18,16 @@ ExternalProject_Add( lzo
18 URL http://files.pacien.net/tmp/lzo-2.10.tar.gz 18 URL http://files.pacien.net/tmp/lzo-2.10.tar.gz
19 URL_HASH SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d 19 URL_HASH SHA1=4924676a9bae5db58ef129dc1cebce3baa3c4b5d
20 CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared 20 CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
21 BUILD_COMMAND make -j4 21 BUILD_COMMAND make -j8
22 INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && 22 INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
23 rm -r <BINARY_DIR> 23 rm -r <BINARY_DIR>
24) 24)
25 25
26ExternalProject_Add( libressl 26ExternalProject_Add( libressl
27 URL http://files.pacien.net/tmp/libressl-2.5.4.tar.gz 27 URL http://files.pacien.net/tmp/libressl-2.5.5.tar.gz
28 URL_HASH SHA256=107a5b522fbb8318d4c3be668075e5e607296f0a9255d71674caa94571336efa 28 URL_HASH SHA256=e57f5e3d5842a81fe9351b6e817fcaf0a749ca4ef35a91465edba9e071dce7c4
29 CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared 29 CONFIGURE_COMMAND <SOURCE_DIR>/configure ${xCONFIG} --disable-shared
30 BUILD_COMMAND make -j4 -C crypto 30 BUILD_COMMAND make -j8 -C crypto
31 INSTALL_COMMAND make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && 31 INSTALL_COMMAND make -C crypto install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
32 make -C include install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && 32 make -C include install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
33 rm -r <BINARY_DIR> 33 rm -r <BINARY_DIR>
@@ -42,7 +42,7 @@ ExternalProject_Add( tinc
42 --with-lzo=${CMAKE_CURRENT_BINARY_DIR}/usr/local 42 --with-lzo=${CMAKE_CURRENT_BINARY_DIR}/usr/local
43 --disable-curses 43 --disable-curses
44 --disable-readline 44 --disable-readline
45 BUILD_COMMAND make -j4 -C src 45 BUILD_COMMAND make -j8 -C src
46 INSTALL_COMMAND make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} && 46 INSTALL_COMMAND make -C src install DESTDIR=${CMAKE_CURRENT_BINARY_DIR} &&
47 ${CMAKE_COMMAND} -E copy 47 ${CMAKE_COMMAND} -E copy
48 ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so && 48 ${CMAKE_CURRENT_BINARY_DIR}/usr/local/sbin/tinc ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libtinc.so &&