Fix LibreSSL build

This commit is contained in:
Davide Depau 2018-12-03 11:48:04 +01:00
parent 5bb19efeca
commit e3a5561561
Signed by: depau
GPG Key ID: C7D999B6A55EFE86
3 changed files with 8 additions and 8 deletions

2
.gitmodules vendored
View File

@ -9,4 +9,4 @@
url = https://github.com/LuaDist/bzip2.git url = https://github.com/LuaDist/bzip2.git
[submodule "app/src/c/libressl"] [submodule "app/src/c/libressl"]
path = dmg2img/src/c/libressl path = dmg2img/src/c/libressl
url = https://github.com/libressl-portable/portable.git url = https://github.com/Depau/libressl.git

View File

@ -3,18 +3,18 @@ cmake_minimum_required(VERSION 3.4)
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/main/assets/bin/${ANDROID_ABI}") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/main/assets/bin/${ANDROID_ABI}")
find_program(CCACHE_FOUND ccache) find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND) if (CCACHE_FOUND)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
endif(CCACHE_FOUND) endif (CCACHE_FOUND)
execute_process( execute_process(
COMMAND truncate -s 0 crypto/compat/getpagesize.c COMMAND truncate -s 0 crypto/compat/getpagesize.c
WORKING_DIRECTORY src/c/libressl) WORKING_DIRECTORY src/c/libressl)
execute_process( execute_process(
COMMAND ./autogen.sh COMMAND touch VERSION
WORKING_DIRECTORY src/c/libressl) WORKING_DIRECTORY src/c/libressl)
include_directories(src/c/bzip2) include_directories(src/c/bzip2)
include_directories(src/c/libressl/include) include_directories(src/c/libressl/include)

@ -1 +1 @@
Subproject commit 4dbf285573d5254e5169be44e45c7685a336b6e8 Subproject commit 8c7e77f2b1482573c3f37ea55965a60726bf967a