Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace libressl with openssl #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace libressl with openssl #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
45 changes: 35 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,26 +73,51 @@ ExternalProject_Add(brotli
CMAKE_ARGS ${COMMON_ARGS} -DBROTLI_DISABLE_CLI=ON -DBROTLI_DISABLE_TESTS=ON
)

ExternalProject_Add(nghttp2
SOURCE_DIR ${SRC_DIR}/nghttp2-1.40.0
CMAKE_ARGS ${COMMON_ARGS} -DENABLE_LIB_ONLY=ON -DENABLE_ASIO_LIB=OFF -DENABLE_FAILMALLOC=OFF -DENABLE_THREADS=OFF -DENABLE_WERROR=OFF -DWITH_JEMALLOC=OFF -DWITH_LIBXML2=OFF -DWITH_MRUBY=OFF -DWITH_NEVERBLEED=OFF -DWITH_SPDYLAY=OFF -DENABLE_SHARED_LIB=OFF -DENABLE_STATIC_LIB=ON
find_package(Perl REQUIRED)

if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
set(WEBCORE_OPENSSL_TARGET "VC-WIN64A")
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
set(WEBCORE_OPENSSL_TARGET "VC-WIN64-ARM")
endif()
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(WEBCORE_OPENSSL_TARGET "linux-x86_64")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
set(WEBCORE_OPENSSL_TARGET "linux-aarch64")
endif()
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(WEBCORE_OPENSSL_TARGET "darwin64-x86_64-cc")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
set(WEBCORE_OPENSSL_TARGET "darwin64-arm64-cc")
endif()
endif()

ExternalProject_Add(openssl
SOURCE_DIR ${SRC_DIR}/openssl-1.1.1m
BINARY_DIR ${SRC_DIR}/openssl-1.1.1m
CONFIGURE_COMMAND ${Perl_EXECUTABLE} ./Configure ${WEBCORE_OPENSSL_TARGET} no-shared no-tests --prefix=${OUT_DIR}
BUILD_COMMAND make -j 12
INSTALL_COMMAND make -j 12 install_dev
)

ExternalProject_Add(libressl
SOURCE_DIR ${SRC_DIR}/libressl-3.0.2
CMAKE_ARGS ${COMMON_ARGS} -DLIBRESSL_APPS=OFF -DLIBRESSL_TESTS=OFF
ExternalProject_Add(nghttp2
SOURCE_DIR ${SRC_DIR}/nghttp2-1.40.0
CMAKE_ARGS ${COMMON_ARGS} -DENABLE_LIB_ONLY=ON -DENABLE_ASIO_LIB=OFF -DENABLE_FAILMALLOC=OFF -DENABLE_THREADS=OFF -DENABLE_WERROR=OFF -DWITH_JEMALLOC=OFF -DWITH_LIBXML2=OFF -DWITH_MRUBY=OFF -DWITH_NEVERBLEED=OFF -DWITH_SPDYLAY=OFF -DENABLE_SHARED_LIB=OFF -DENABLE_STATIC_LIB=ON -DOPENSSL_ROOT_DIR=${OUT_DIR} -DOPENSSL_USE_STATIC_LIBS=TRUE
)

ExternalProject_Add(curl
SOURCE_DIR ${SRC_DIR}/curl-7.69.1
CMAKE_ARGS ${COMMON_ARGS} -DBUILD_CURL_EXE=OFF -DBUILD_TESTING=OFF -DCMAKE_USE_GSSAPI=OFF -DCMAKE_USE_LIBSSH2=OFF -DCMAKE_USE_OPENLDAP=OFF -DCURL_BROTLI=ON -DCURL_ZLIB=ON -DCURL_DISABLE_COOKIES=ON -DCURL_DISABLE_CRYPTO_AUTH=OFF -DCURL_DISABLE_DICT=ON -DCURL_DISABLE_FILE=OFF -DCURL_DISABLE_FTP=ON -DCURL_DISABLE_GOPHER=ON -DCURL_DISABLE_HTTP=OFF -DCURL_DISABLE_IMAP=ON -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON -DCURL_DISABLE_POP3=ON -DCURL_DISABLE_PROXY=OFF -DCURL_DISABLE_RTSP=ON -DCURL_DISABLE_SMTP=ON -DCURL_DISABLE_TELNET=ON -DCURL_DISABLE_TFTP=ON -DENABLE_ARES=OFF -DENABLE_MANUAL=OFF -DENABLE_THREADED_RESOLVER=ON -DUSE_NGHTTP2=ON -DUSE_WIN32_LDAP=OFF -DENABLE_IPV6=ON -DUSE_OPENSSL=ON -DNGHTTP2_INCLUDE_DIR=${OUT_DIR}/include -DCURL_STATICLIB=ON -DBUILD_SHARED_LIBS=OFF -DZLIB_FOUND=1 -DZLIB_INCLUDE_DIRS:STRING=${OUT_DIR}/include -DBROTLI_FOUND=1 -DBROTLI_INCLUDE_DIRS:STRING=${OUT_DIR}/include/brotli
-DOPENSSL_INCLUDE_DIR=${OUT_DIR}/include -DCMAKE_PREFIX_PATH=${OUT_DIR} -DNGHTTP2_LIBRARY=${OUT_DIR}/lib/foobar.a
DEPENDS nghttp2 libressl brotli zlib
-DOPENSSL_INCLUDE_DIR=${OUT_DIR}/include -DOPENSSL_ROOT_DIR=${OUT_DIR} -DOPENSSL_USE_STATIC_LIBS=TRUE -DCMAKE_PREFIX_PATH=${OUT_DIR} -DNGHTTP2_LIBRARY=${OUT_DIR}/lib/foobar.a
DEPENDS nghttp2 openssl brotli zlib
)

ExternalProject_Add(freetype
SOURCE_DIR ${SRC_DIR}/freetype-2.10.1
CMAKE_ARGS ${COMMON_ARGS} -DFT_WITH_ZLIB=ON -DFT_WITH_BZIP2=OFF -DFT_WITH_PNG=ON -DFT_WITH_HARFBUZZ=OFF -DPNG_PNG_INCLUDE_DIR=${OUT_DIR}/include/libpng16 -DPNG_LIBRARY=${OUT_DIR}/lib/foobar.a -DZLIB_INCLUDE_DIR=${OUT_DIR}/include -DZLIB_LIBRARY=${OUT_DIR}/lib/foobar.a
CMAKE_ARGS ${COMMON_ARGS} -DFT_WITH_ZLIB=ON -DFT_WITH_BZIP2=OFF -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DFT_WITH_PNG=ON -DFT_WITH_HARFBUZZ=OFF -DPNG_PNG_INCLUDE_DIR=${OUT_DIR}/include/libpng16 -DPNG_LIBRARY=${OUT_DIR}/lib/foobar.a -DZLIB_INCLUDE_DIR=${OUT_DIR}/include -DZLIB_LIBRARY=${OUT_DIR}/lib/foobar.a
DEPENDS zlib libpng
)

Expand All @@ -108,7 +133,7 @@ ExternalProject_Add(harfbuzz
DEPENDS freetype icu
)

add_custom_target(WebCore-Deps ALL DEPENDS zlib libpng libjpeg-turbo icu libxml2 libxslt brotli nghttp2 libressl curl freetype harfbuzz)
add_custom_target(WebCore-Deps ALL DEPENDS zlib libpng libjpeg-turbo icu libxml2 libxslt brotli nghttp2 openssl curl freetype harfbuzz)

INSTALL(DIRECTORY "${OUT_DIR}/include" DESTINATION ".")
INSTALL(DIRECTORY "${OUT_DIR}/bin" DESTINATION ".")
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ ninja install

## Building on macOS/Linux

To build for macOS/Linux:
To build for macOS/Linux, you must have a recent version of Clang:

```
mkdir build
cd build
cmake .. -GNinja
ninja
CC=clang CXX=clang++ cmake .. -GNinja
CC=clang CXX=clang++ ninja
ninja install
```

Expand Down
Empty file modified make.sh
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion src/curl-7.69.1/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ if(CMAKE_USE_OPENSSL)
list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto)
else()
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
endif()

set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
Expand Down
Loading