pull/32/merge
apexliu 2017-03-06 17:59:58 +08:00
parent 72583eb676
commit a2fdd126e8
1 changed files with 9 additions and 2 deletions

View File

@ -285,6 +285,8 @@ class BuilderLinux(BuilderBase):
# # os.system('make install')
# os.chdir(old_p)
# TODO: need modify the `config.h.cmake` and comment out HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT.
cmake_define = ' -DCMAKE_INSTALL_PREFIX={}' \
' -D_OPENSSL_VERSION={}' \
' -DOPENSSL_INCLUDE_DIR={}/include' \
@ -299,7 +301,13 @@ class BuilderLinux(BuilderBase):
' -DWITH_BENCHMARKS=OFF' \
' -DWITH_NACL=OFF' \
' ..'.format(self.PATH_RELEASE, OPENSSL_VER, self.PATH_RELEASE, self.PATH_RELEASE)
utils.cmake(build_path, 'Release', False, cmake_define)
# libssh always try to build shared library we do not care, but it may fail.
# so catch the except, we will check the final output file `libssh.a` ourselves.
try:
utils.cmake(build_path, 'Release', False, cmake_define)
except:
pass
# because make install will fail because we can not disable ssh_shared target,
# so we copy necessary files ourselves.
@ -307,7 +315,6 @@ class BuilderLinux(BuilderBase):
utils.copy_file(os.path.join(self.LIBSSH_PATH_SRC, 'build', 'src'), os.path.join(self.PATH_RELEASE, 'lib'), 'libssh.a')
utils.copy_ex(os.path.join(self.LIBSSH_PATH_SRC, 'include'), os.path.join(self.PATH_RELEASE, 'include'), 'libssh')
def _build_sqlite(self, file_name):
if not os.path.exists(self.SQLITE_PATH_SRC):
os.system('tar -zxvf "{}/{}" -C "{}"'.format(PATH_DOWNLOAD, file_name, self.PATH_TMP))