mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-24 06:02:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove zlib

Browse Source 
The library no longer uses zlib, so we can remove the option to build
with zlib.
This commit is contained in:
Jaeden Amero 2019-02-26 10:47:14 +00:00
parent d832f187f7
commit d874a1fd14
6 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -5,8 +5,6 @@ else()
project("mbed TLS" C) project("mbed TLS" C)
endif() endif()
option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)
option(ENABLE_PROGRAMS "Build mbed TLS programs." ON) option(ENABLE_PROGRAMS "Build mbed TLS programs." ON)
option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF) option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF)
@ -169,14 +167,6 @@ endif()
include_directories(include/) include_directories(include/)
include_directories(library/) include_directories(library/)
if(ENABLE_ZLIB_SUPPORT)
find_package(ZLIB)
if(ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIR})
endif(ZLIB_FOUND)
endif(ENABLE_ZLIB_SUPPORT)
add_subdirectory(library) add_subdirectory(library)
add_subdirectory(include) add_subdirectory(include)

4
library/CMakeLists.txt
View File

@ -123,10 +123,6 @@ if(HAIKU)
set(libs ${libs} network) set(libs ${libs} network)
endif(HAIKU) endif(HAIKU)
if(ENABLE_ZLIB_SUPPORT)
set(libs ${libs} ${ZLIB_LIBRARIES})
endif(ENABLE_ZLIB_SUPPORT)
if(LINK_WITH_PTHREAD) if(LINK_WITH_PTHREAD)
set(libs ${libs} pthread) set(libs ${libs} pthread)
endif() endif()

5
programs/Makefile
View File

@ -41,11 +41,6 @@ EXEXT=
SHARED_SUFFIX= SHARED_SUFFIX=
endif endif
# Zlib shared library extensions:
ifdef ZLIB
LOCAL_LDFLAGS += -lz
endif
APPS = \ APPS = \
aes/aescrypt2$(EXEXT) \ aes/aescrypt2$(EXEXT) \
aes/crypt_and_hash$(EXEXT) \ aes/crypt_and_hash$(EXEXT) \

4
programs/test/CMakeLists.txt
View File

@ -2,10 +2,6 @@ set(libs
mbedtls mbedtls
) )
if(ENABLE_ZLIB_SUPPORT)
set(libs ${libs} ${ZLIB_LIBRARIES})
endif(ENABLE_ZLIB_SUPPORT)
add_executable(selftest selftest.c) add_executable(selftest selftest.c)
target_link_libraries(selftest ${libs}) target_link_libraries(selftest ${libs})

4
tests/CMakeLists.txt
View File

@ -2,10 +2,6 @@ set(libs
mbedtls mbedtls
) )
if(ENABLE_ZLIB_SUPPORT)
set(libs ${libs} ${ZLIB_LIBRARIES})
endif(ENABLE_ZLIB_SUPPORT)
find_package(Perl) find_package(Perl)
if(NOT PERL_FOUND) if(NOT PERL_FOUND)
message(FATAL_ERROR "Cannot build test suites without Perl") message(FATAL_ERROR "Cannot build test suites without Perl")

5
tests/Makefile
View File

@ -48,11 +48,6 @@ SHARED_SUFFIX=
PYTHON ?= python2 PYTHON ?= python2
endif endif
# Zlib shared library extensions:
ifdef ZLIB
LOCAL_LDFLAGS += -lz
endif
# A test application is built for each suites/test_suite_*.data file. # A test application is built for each suites/test_suite_*.data file.
# Application name is same as .data file's base name and can be # Application name is same as .data file's base name and can be
# constructed by stripping path 'suites/' and extension .data. # constructed by stripping path 'suites/' and extension .data.