test curl-tidy-2 + fast-track

curl · Oct 17, 2023 · f37d569 · f37d569
1 parent c4fe1bc
commit f37d569
Show file tree

Hide file tree

Showing 2 changed files with 1,190 additions and 3 deletions.
diff --git a/curl-cmake.sh b/curl-cmake.sh
@@ -124,6 +124,7 @@ _VER="$1"
     options="${options} -DCURL_ZSTD=ON"
     options="${options} -DZstd_INCLUDE_DIR=${_TOP}/zstd/${_PP}/include"
     options="${options} -DZstd_LIBRARY=${_TOP}/zstd/${_PP}/lib/libzstd.a"
+    options="${options} -DHAVE_ZSTD_CREATEDSTREAM=1"  # fast-track configuration. Introduced in v1.0.0 2016-08-31.
   else
     options="${options} -DCURL_ZSTD=OFF"
   fi
@@ -140,9 +141,9 @@ _VER="$1"
     if [ "${_OPENSSL}" = 'boringssl' ] || [ "${_OPENSSL}" = 'awslc' ]; then
       if [ "${_OPENSSL}" = 'boringssl' ]; then
         CPPFLAGS="${CPPFLAGS} -DCURL_BORINGSSL_VERSION=\\\"$(printf '%.8s' "${BORINGSSL_VER_}")\\\""
-        options="${options} -DHAVE_BORINGSSL=ON -DHAVE_AWSLC=OFF"  # fast-track configuration
+        options="${options} -DHAVE_BORINGSSL=1 -DHAVE_AWSLC=0"  # fast-track configuration
       else
-        options="${options} -DHAVE_BORINGSSL=OFF -DHAVE_AWSLC=ON"  # fast-track configuration
+        options="${options} -DHAVE_BORINGSSL=0 -DHAVE_AWSLC=1"  # fast-track configuration
       fi
       if [ "${_TOOLCHAIN}" = 'mingw-w64' ] && [ "${_CPU}" = 'x64' ] && [ "${_CRT}" = 'ucrt' ]; then  # FIXME
         LIBS="${LIBS} -Wl,-Bdynamic -lpthread -Wl,-Bstatic"
@@ -151,15 +152,22 @@ _VER="$1"
       fi
       h3=1
     else
-      options="${options} -DHAVE_BORINGSSL=OFF -DHAVE_AWSLC=OFF"  # fast-track configuration
+      options="${options} -DHAVE_BORINGSSL=0 -DHAVE_AWSLC=0"  # fast-track configuration
       if [ "${_OPENSSL}" = 'quictls' ] || [ "${_OPENSSL}" = 'libressl' ]; then
         h3=1
       fi
     fi
+    [ "${_OPENSSL}" != 'libressl' ] && options="${options} -DHAVE_SSL_SET0_WBIO=1"  # fast-track configuration
+    [ "${h3}" = '1' ] && options="${options} -DHAVE_SSL_CTX_SET_QUIC_METHOD=1"  # fast-track configuration
   else
     options="${options} -DCURL_USE_OPENSSL=OFF"
   fi
 
+  # fast-track configuration
+  options="${options} -DCMAKE_HAVE_LIBC_PTHREAD=0 -DCMAKE_HAVE_PTHREADS_CREATE=0 -DCMAKE_HAVE_PTHREAD_CREATE=0"  # find_package(Threads)
+  options="${options} -DHAVE_STDATOMIC_H=1 -DHAVE_ATOMIC=1 -DHAVE_STRTOK_R=1"
+  options="${options} -DHAVE_FILE_OFFSET_BITS=1 -DHAVE_VARIADIC_MACROS_C99=1 -DHAVE_VARIADIC_MACROS_GCC=1"
+
   if [ -d ../wolfssl ]; then
     [ -n "${mainssl}" ] || mainssl='wolfssl'
     options="${options} -DCURL_USE_WOLFSSL=ON"