This is an automated email from the ASF dual-hosted git repository. lordgamez pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit f17839f9c895795f9604e151c9c2246e921ab7b6 Author: Marton Szasz <[email protected]> AuthorDate: Wed Feb 19 13:03:02 2025 +0100 MINIFICPP-2527 build log cleanup: skip unused openssl modules, avoid download progress log spam Signed-off-by: Marton Szasz <[email protected]> Signed-off-by: Gabor Gyimesi <[email protected]> This closes #1932 --- cmake/BundledAwsSdkCpp.cmake | 2 ++ cmake/BundledAzureSdkCpp.cmake | 2 ++ cmake/BundledBZip2.cmake | 2 ++ cmake/BundledJemalloc.cmake | 2 ++ cmake/BundledLibArchive.cmake | 2 ++ cmake/BundledLibSSH2.cmake | 2 ++ cmake/BundledLibSodium.cmake | 4 ++++ cmake/BundledLibXml2.cmake | 4 ++++ cmake/BundledLibcURL.cmake | 2 ++ cmake/BundledMbedTLS.cmake | 2 ++ cmake/BundledOSSPUUID.cmake | 2 ++ cmake/BundledOpen62541.cmake | 2 ++ cmake/BundledOpenCV.cmake | 2 ++ cmake/BundledOpenSSL.cmake | 20 ++++++++++++++++++-- cmake/BundledPugiXml.cmake | 2 ++ cmake/BundledRTIMULib.cmake | 2 ++ cmake/BundledRocksDB.cmake | 2 ++ cmake/BundledYamlCpp.cmake | 2 ++ 18 files changed, 56 insertions(+), 2 deletions(-) diff --git a/cmake/BundledAwsSdkCpp.cmake b/cmake/BundledAwsSdkCpp.cmake index 222a89940..8bb207fba 100644 --- a/cmake/BundledAwsSdkCpp.cmake +++ b/cmake/BundledAwsSdkCpp.cmake @@ -90,6 +90,8 @@ function(use_bundled_libaws SOURCE_DIR BINARY_DIR) PATCH_COMMAND ${AWS_SDK_CPP_PATCH_COMMAND} BUILD_BYPRODUCTS "${AWSSDK_LIBRARIES_LIST}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set dependencies diff --git a/cmake/BundledAzureSdkCpp.cmake b/cmake/BundledAzureSdkCpp.cmake index 3f1459871..3294ac636 100644 --- a/cmake/BundledAzureSdkCpp.cmake +++ b/cmake/BundledAzureSdkCpp.cmake @@ -76,6 +76,8 @@ function(use_bundled_libazure SOURCE_DIR BINARY_DIR) CMAKE_ARGS ${AZURE_SDK_CMAKE_ARGS} LIST_SEPARATOR % # This is needed for passing semicolon-separated lists PATCH_COMMAND ${PC} + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set dependencies diff --git a/cmake/BundledBZip2.cmake b/cmake/BundledBZip2.cmake index 9c3fb5b80..e66e0dac7 100644 --- a/cmake/BundledBZip2.cmake +++ b/cmake/BundledBZip2.cmake @@ -47,6 +47,8 @@ function(use_bundled_bzip2 SOURCE_DIR BINARY_DIR) PATCH_COMMAND ${PC} BUILD_BYPRODUCTS "${BZIP2_BIN_DIR}/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables diff --git a/cmake/BundledJemalloc.cmake b/cmake/BundledJemalloc.cmake index 55b982b01..6dff75305 100644 --- a/cmake/BundledJemalloc.cmake +++ b/cmake/BundledJemalloc.cmake @@ -38,6 +38,8 @@ function(use_bundled_jemalloc SOURCE_DIR BINARY_DIR) PATCH_COMMAND ./autogen.sh && ./configure "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS}" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS}" STEP_TARGETS build EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables diff --git a/cmake/BundledLibArchive.cmake b/cmake/BundledLibArchive.cmake index 12a4bd3df..5191dbd92 100644 --- a/cmake/BundledLibArchive.cmake +++ b/cmake/BundledLibArchive.cmake @@ -75,6 +75,8 @@ function(use_bundled_libarchive SOURCE_DIR BINARY_DIR) PATCH_COMMAND ${PC} BUILD_BYPRODUCTS "${BINARY_DIR}/thirdparty/libarchive-install/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set dependencies diff --git a/cmake/BundledLibSSH2.cmake b/cmake/BundledLibSSH2.cmake index bd7c8a2d6..9d6ee32a9 100644 --- a/cmake/BundledLibSSH2.cmake +++ b/cmake/BundledLibSSH2.cmake @@ -52,6 +52,8 @@ function(use_bundled_libssh2 SOURCE_DIR BINARY_DIR) PATCH_COMMAND ${PC} BUILD_BYPRODUCTS "${BINARY_DIR}/thirdparty/libssh2-install/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set dependencies diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake index 98d05b737..001a90dad 100644 --- a/cmake/BundledLibSodium.cmake +++ b/cmake/BundledLibSodium.cmake @@ -56,6 +56,8 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR) PATCH_COMMAND ${PC} BUILD_BYPRODUCTS "${LIBSODIUM_BIN_DIR}/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) else() set(CONFIGURE_COMMAND ./configure --disable-pie --enable-minimal "--prefix=${LIBSODIUM_BIN_DIR}") @@ -75,6 +77,8 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR) PATCH_COMMAND "" STEP_TARGETS build EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) endif() diff --git a/cmake/BundledLibXml2.cmake b/cmake/BundledLibXml2.cmake index b5de5503b..5ab5a74a6 100644 --- a/cmake/BundledLibXml2.cmake +++ b/cmake/BundledLibXml2.cmake @@ -57,6 +57,8 @@ function(use_bundled_libxml2 SOURCE_DIR BINARY_DIR) PATCH_COMMAND ${PC} BUILD_BYPRODUCTS "${BINARY_DIR}/thirdparty/libxml2-install/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) else() ExternalProject_Add( @@ -74,6 +76,8 @@ function(use_bundled_libxml2 SOURCE_DIR BINARY_DIR) PATCH_COMMAND ./configure --enable-shared=no --enable-static=yes --with-pic=yes --with-iconv=no --with-zlib=no --with-lzma=no --with-python=no --with-ftp=no --with-http=no --prefix=${BINARY_DIR}/thirdparty/libxml2-install STEP_TARGETS build EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) endif() diff --git a/cmake/BundledLibcURL.cmake b/cmake/BundledLibcURL.cmake index f9ad84e31..207d97171 100644 --- a/cmake/BundledLibcURL.cmake +++ b/cmake/BundledLibcURL.cmake @@ -67,6 +67,8 @@ function(use_bundled_curl SOURCE_DIR BINARY_DIR) PATCH_COMMAND ${PC} BUILD_BYPRODUCTS "${BINARY_DIR}/thirdparty/curl-install/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set dependencies diff --git a/cmake/BundledMbedTLS.cmake b/cmake/BundledMbedTLS.cmake index 7d9184cf4..f32c87f83 100644 --- a/cmake/BundledMbedTLS.cmake +++ b/cmake/BundledMbedTLS.cmake @@ -55,6 +55,8 @@ function(use_bundled_mbedtls SOURCE_DIR BINARY_DIR) CMAKE_ARGS ${MBEDTLS_CMAKE_ARGS} BUILD_BYPRODUCTS ${MBEDTLS_LIBRARIES_LIST} EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake index 747e52c27..0a2852625 100644 --- a/cmake/BundledOSSPUUID.cmake +++ b/cmake/BundledOSSPUUID.cmake @@ -67,6 +67,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR) PATCH_COMMAND ${PC} STEP_TARGETS build EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables diff --git a/cmake/BundledOpen62541.cmake b/cmake/BundledOpen62541.cmake index 56c75ea98..b2aa068e4 100644 --- a/cmake/BundledOpen62541.cmake +++ b/cmake/BundledOpen62541.cmake @@ -51,6 +51,8 @@ function(use_bundled_open62541 SOURCE_DIR BINARY_DIR) CMAKE_ARGS ${OPEN62541_CMAKE_ARGS} BUILD_BYPRODUCTS "${OPEN62541_BYPRODUCT_DIR}/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set dependencies diff --git a/cmake/BundledOpenCV.cmake b/cmake/BundledOpenCV.cmake index ee4a7ff94..c53294e51 100644 --- a/cmake/BundledOpenCV.cmake +++ b/cmake/BundledOpenCV.cmake @@ -112,6 +112,8 @@ function(use_bundled_opencv SOURCE_DIR BINARY_DIR) BUILD_BYPRODUCTS "${BYPRODUCTS}" EXCLUDE_FROM_ALL TRUE LIST_SEPARATOR % # This is needed for passing semicolon-separated lists + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables diff --git a/cmake/BundledOpenSSL.cmake b/cmake/BundledOpenSSL.cmake index 4ffa51e80..0b9ed6f2e 100644 --- a/cmake/BundledOpenSSL.cmake +++ b/cmake/BundledOpenSSL.cmake @@ -49,6 +49,18 @@ function(use_openssl SOURCE_DIR BINARY_DIR) set(OPENSSL_SHARED_FLAG "no-shared" CACHE STRING "" FORCE) endif() + set(OPENSSL_EXTRA_FLAGS + no-tests # Disable tests + no-apps # disable executables + no-capieng # disable CAPI engine (legacy) + no-dso # disable dynamic libraries + no-docs # disable docs and manpages + no-legacy # disable legacy modules + no-module # disable dynamically loadable engines + no-pinshared # don't pin shared libraries in the process memory + enable-tfo # Enable TCP Fast Open + no-ssl) # disable SSLv3 + set(OPENSSL_BIN_DIR "${BINARY_DIR}/thirdparty/openssl-install" CACHE STRING "" FORCE) FOREACH(BYPRODUCT ${BYPRODUCTS}) @@ -91,11 +103,13 @@ function(use_openssl SOURCE_DIR BINARY_DIR) URL_HASH "SHA256=2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281" SOURCE_DIR "${BINARY_DIR}/thirdparty/openssl-src" BUILD_IN_SOURCE true - CONFIGURE_COMMAND perl Configure "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} ${OPENSSL_WINDOWS_COMPILE_FLAGS}" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} ${OPENSSL_WINDOWS_COMPILE_FLAGS}" ${OPENSSL_SHARED_FLAG} no-tests "--prefix=${OPENSSL_BIN_DIR}" "--openssldir=${OPENSSL_BIN_DIR}" + CONFIGURE_COMMAND perl Configure "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} ${OPENSSL_WINDOWS_COMPILE_FLAGS}" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} ${OPENSSL_WINDOWS_COMPILE_FLAGS}" ${OPENSSL_SHARED_FLAG} ${OPENSSL_EXTRA_FLAGS} "--prefix=${OPENSSL_BIN_DIR}" "--openssldir=${OPENSSL_BIN_DIR}" BUILD_BYPRODUCTS ${OPENSSL_LIBRARIES_LIST} EXCLUDE_FROM_ALL TRUE BUILD_COMMAND ${OPENSSL_BUILD_COMMAND} INSTALL_COMMAND nmake install + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) else() ExternalProject_Add( @@ -104,9 +118,11 @@ function(use_openssl SOURCE_DIR BINARY_DIR) URL_HASH "SHA256=2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281" SOURCE_DIR "${BINARY_DIR}/thirdparty/openssl-src" BUILD_IN_SOURCE true - CONFIGURE_COMMAND ./Configure "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} -fPIC" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" ${OPENSSL_SHARED_FLAG} no-tests "--prefix=${OPENSSL_BIN_DIR}" "--openssldir=${OPENSSL_BIN_DIR}" + CONFIGURE_COMMAND ./Configure "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} -fPIC" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" ${OPENSSL_SHARED_FLAG} ${OPENSSL_EXTRA_FLAGS} "--prefix=${OPENSSL_BIN_DIR}" "--openssldir=${OPENSSL_BIN_DIR}" BUILD_BYPRODUCTS ${OPENSSL_LIBRARIES_LIST} EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) endif() diff --git a/cmake/BundledPugiXml.cmake b/cmake/BundledPugiXml.cmake index ef97bf0c1..d2a07da71 100644 --- a/cmake/BundledPugiXml.cmake +++ b/cmake/BundledPugiXml.cmake @@ -41,6 +41,8 @@ function(use_bundled_pugixml SOURCE_DIR BINARY_DIR) CMAKE_ARGS ${PUGI_CMAKE_ARGS} BUILD_BYPRODUCTS "${PUGI_BYPRODUCT_DIR}/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables diff --git a/cmake/BundledRTIMULib.cmake b/cmake/BundledRTIMULib.cmake index a5a7febcd..6b0cdd82b 100644 --- a/cmake/BundledRTIMULib.cmake +++ b/cmake/BundledRTIMULib.cmake @@ -32,6 +32,8 @@ function(use_bundled_rtimulib SOURCE_DIR BINARY_DIR) INSTALL_COMMAND "" BUILD_BYPRODUCTS "${BINARY_DIR}/thirdparty/RTIMULib/RTIMULib/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables diff --git a/cmake/BundledRocksDB.cmake b/cmake/BundledRocksDB.cmake index ec137201d..85a28304a 100644 --- a/cmake/BundledRocksDB.cmake +++ b/cmake/BundledRocksDB.cmake @@ -80,6 +80,8 @@ function(use_bundled_rocksdb SOURCE_DIR BINARY_DIR) BUILD_BYPRODUCTS "${BINARY_DIR}/thirdparty/rocksdb-install/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE LIST_SEPARATOR % # This is needed for passing semicolon-separated lists + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables diff --git a/cmake/BundledYamlCpp.cmake b/cmake/BundledYamlCpp.cmake index d88663a04..536e1c5a7 100644 --- a/cmake/BundledYamlCpp.cmake +++ b/cmake/BundledYamlCpp.cmake @@ -50,6 +50,8 @@ function(use_bundled_yamlcpp SOURCE_DIR BINARY_DIR) CMAKE_ARGS ${YAMLCPP_CMAKE_ARGS} BUILD_BYPRODUCTS "${BINARY_DIR}/thirdparty/yaml-cpp-install/${BYPRODUCT}" EXCLUDE_FROM_ALL TRUE + DOWNLOAD_NO_PROGRESS TRUE + TLS_VERIFY TRUE ) # Set variables
