From 1e6fd6eaec55d92f0c225634cb44739655bc8c07 Mon Sep 17 00:00:00 2001 From: theMackabu Date: Wed, 8 Apr 2026 10:29:54 -0700 Subject: [PATCH] kill mbedtls and prep for boringssl --- .github/actions/build-native-deps/action.yml | 35 +-- .github/actions/build-project/action.yml | 8 - .github/install/install.ab | 21 +- .github/install/install.sh | 263 ++++++++---------- .github/versions.json | 1 - .github/workflows/build-platform.yml | 24 +- .github/workflows/build-single.yml | 9 - .github/workflows/build.yml | 23 +- BUILDING.md | 58 ++-- README.md | 3 - libant/meson_options.txt | 1 - libant/scripts/compile.sh | 2 +- libant/scripts/deps.sh | 17 -- meson/deps/meson.build | 18 +- meson/snapshot/meson.build | 1 - meson/version/meson.build | 2 - meson_options.txt | 1 - src/core/features.ts | 2 +- src/types/process.d.ts | 5 +- .../patches/tlsuv-fix-fd-type.patch | 24 -- vendor/packagefiles/tlsuv/meson.build | 20 +- vendor/packagefiles/tlsuv/meson_options.txt | 2 +- 22 files changed, 161 insertions(+), 379 deletions(-) delete mode 100644 vendor/packagefiles/patches/tlsuv-fix-fd-type.patch diff --git a/.github/actions/build-native-deps/action.yml b/.github/actions/build-native-deps/action.yml index e8c1eb6..4a62d28 100644 --- a/.github/actions/build-native-deps/action.yml +++ b/.github/actions/build-native-deps/action.yml @@ -1,9 +1,9 @@ name: Build Native Dependencies -description: Build libsodium, mbedtls, zlib as needed +description: Build libsodium and zlib as needed inputs: deps: - description: Space-separated list of deps to build (libsodium mbedtls zlib) + description: Space-separated list of deps to build (libsodium zlib) required: true prefix: description: Install prefix @@ -29,8 +29,6 @@ inputs: default: '' libsodium_version: required: true - mbedtls_version: - required: true zlib_version: required: true @@ -72,35 +70,6 @@ runs: make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4) make install - - name: Build mbedtls - if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.deps, 'mbedtls') - shell: bash - run: | - if [[ "$RUNNER_OS" == "Windows" ]]; then - export PATH="$(cygpath "$RUNNER_TEMP/msys64/clang64/bin"):$PATH" - fi - git clone --depth 1 --branch mbedtls-${{ inputs.mbedtls_version }} --recurse-submodules https://github.com/Mbed-TLS/mbedtls.git /tmp/mbedtls - cd /tmp/mbedtls - CMAKE_GENERATOR="${{ inputs.cmake_generator }}" - CMAKE_ARGS="-DCMAKE_C_COMPILER=${{ inputs.cc }}" - if [[ "$RUNNER_OS" == "Windows" ]]; then - AR_PATH="$(which ${{ inputs.ar }})" - RANLIB_PATH="$(which ${{ inputs.ranlib }})" - CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_AR=$AR_PATH -DCMAKE_RANLIB=$RANLIB_PATH" - fi - if [[ -n "${{ inputs.cxx }}" ]]; then - CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_COMPILER=${{ inputs.cxx }}" - fi - cmake -B build \ - ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \ - $CMAKE_ARGS \ - -DCMAKE_INSTALL_PREFIX=${{ steps.prep.outputs.prefix }} \ - -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_STATIC_MBEDTLS_LIBRARY=ON -DUSE_SHARED_MBEDTLS_LIBRARY=OFF - cmake --build build -j$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4) - cmake --install build - - name: Build zlib if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.deps, 'zlib') shell: bash diff --git a/.github/actions/build-project/action.yml b/.github/actions/build-project/action.yml index c8f51ec..3fb827b 100644 --- a/.github/actions/build-project/action.yml +++ b/.github/actions/build-project/action.yml @@ -36,10 +36,6 @@ inputs: build_timestamp: description: Build timestamp required: true - tls_library: - description: TLS library (openssl or mbedtls) - required: false - default: 'openssl' static_link: description: Enable static linking required: false @@ -110,10 +106,6 @@ runs: MESON_ARGS="$MESON_ARGS -Dbuild_timestamp=${{ inputs.build_timestamp }}" MESON_ARGS="$MESON_ARGS -Ddeps_prefix_cmake=$DEPS_PREFIX" - if [[ "${{ inputs.tls_library }}" == "mbedtls" ]]; then - MESON_ARGS="$MESON_ARGS -Dtls_library=mbedtls" - fi - if [[ "${{ inputs.static_link }}" == "true" ]]; then MESON_ARGS="$MESON_ARGS --prefer-static -Dstatic_link=true" fi diff --git a/.github/install/install.ab b/.github/install/install.ab index 2106d5c..04b7c11 100644 --- a/.github/install/install.ab +++ b/.github/install/install.ab @@ -185,27 +185,12 @@ main(args) { echo_error("unzip is required to install ant") } - if len(args) > 3 { - echo_error("Too many arguments. Usage: install.ab [tag] [--mbedtls]") + if len(args) > 2 { + echo_error("Too many arguments. Usage: install.ab [tag]") } let target = get_target() - let mbedtls_env = env_var_get("MBEDTLS") failed { "" } - let use_mbedtls = mbedtls_env != "" - - for arg in args { - if arg == "--mbedtls" { use_mbedtls = true } - } - - if use_mbedtls { - if starts_with(target, "darwin") { - target = "{target}-mbedtls" - } else { - echo_error("--mbedtls option is only supported on macOS") - } - } - let github = env_var_get("GITHUB") failed { "https://github.com" } @@ -217,7 +202,7 @@ main(args) { let ant_uri = "" let tag = "" for arg in args { - if arg != "--mbedtls" and arg != args[0] { tag = arg } + if arg != args[0] { tag = arg } } if tag == "" { diff --git a/.github/install/install.sh b/.github/install/install.sh index 6163a64..afbb74b 100755 --- a/.github/install/install.sh +++ b/.github/install/install.sh @@ -3,12 +3,12 @@ # Source: https://github.com/theMackabu/ant/blob/master/.github/install/install.ab bash_version__0_v0() { - major_27="$(echo "${BASH_VERSINFO[0]}")" - minor_28="$(echo "${BASH_VERSINFO[1]}")" + major_24="$(echo "${BASH_VERSINFO[0]}")" + minor_25="$(echo "${BASH_VERSINFO[1]}")" command_2="$(echo "${BASH_VERSINFO[2]}")" __status=$? - patch_29="${command_2}" - ret_bash_version0_v0=("${major_27}" "${minor_28}" "${patch_29}") + patch_26="${command_2}" + ret_bash_version0_v0=("${major_24}" "${minor_25}" "${patch_26}") return 0 } @@ -16,7 +16,7 @@ replace__1_v0() { local source=$1 local search=$2 local replace=$3 - result_26="" + result_23="" bash_version__0_v0 left_comp=("${ret_bash_version0_v0[@]}") right_comp=(4 3) @@ -36,13 +36,13 @@ replace__1_v0() { (( "${#left_comp[@]}" == "${#right_comp[@]}" || "${#left_comp[@]}" > "${#right_comp[@]}" )) && echo 1 || echo 0 )" if [ "${comp}" != 0 ]; then - result_26="${source//"${search}"/"${replace}"}" + result_23="${source//"${search}"/"${replace}"}" __status=$? else - result_26="${source//"${search}"/${replace}}" + result_23="${source//"${search}"/${replace}}" __status=$? fi - ret_replace1_v0="${result_26}" + ret_replace1_v0="${result_23}" return 0 } @@ -201,11 +201,11 @@ tildify__134_v0() { ret_tildify134_v0="${path}" return 0 fi - home_25="${ret_env_var_get106_v0}" - starts_with__23_v0 "${path}" "${home_25}" + home_22="${ret_env_var_get106_v0}" + starts_with__23_v0 "${path}" "${home_22}" ret_starts_with23_v0__9_6="${ret_starts_with23_v0}" if [ "${ret_starts_with23_v0__9_6}" != 0 ]; then - replace__1_v0 "${path}" "${home_25}" "~" + replace__1_v0 "${path}" "${home_22}" "~" ret_tildify134_v0="${ret_replace1_v0}" return 0 fi @@ -297,35 +297,35 @@ configure_shell__137_v0() { local bin_env=$4 local tilde_bin_dir=$5 get_shell_config__136_v0 "${shell_name}" "${install_env}" "${quoted_install_dir}" "${bin_env}" - commands_34=("${ret_get_shell_config136_v0[@]}") - refresh_command_35="" + commands_31=("${ret_get_shell_config136_v0[@]}") + refresh_command_32="" env_var_get__106_v0 "HOME" __status=$? if [ "${__status}" != 0 ]; then ret_configure_shell137_v0="" return 0 fi - home_36="${ret_env_var_get106_v0}" + home_33="${ret_env_var_get106_v0}" if [ "$([ "_${shell_name}" != "_fish" ]; echo $?)" != 0 ]; then - fish_config_37="${home_36}/.config/fish/config.fish" - tildify__134_v0 "${fish_config_37}" - tilde_fish_config_38="${ret_tildify134_v0}" - file_exists__40_v0 "${fish_config_37}" + fish_config_34="${home_33}/.config/fish/config.fish" + tildify__134_v0 "${fish_config_34}" + tilde_fish_config_35="${ret_tildify134_v0}" + file_exists__40_v0 "${fish_config_34}" ret_file_exists40_v0__79_10="${ret_file_exists40_v0}" if [ "${ret_file_exists40_v0__79_10}" != 0 ]; then - content_39=" + content_36=" # ant " - for command_40 in "${commands_34[@]}"; do - content_39+="${command_40} + for command_37 in "${commands_31[@]}"; do + content_36+="${command_37} " done - file_append__43_v0 "${fish_config_37}" "${content_39}" + file_append__43_v0 "${fish_config_34}" "${content_36}" __status=$? if [ "${__status}" != 0 ]; then - echo "Manually add the directory to ${tilde_fish_config_38} (or similar):" - for cmd_41 in "${commands_34[@]}"; do - bold__117_v0 "${cmd_41}" + echo "Manually add the directory to ${tilde_fish_config_35} (or similar):" + for cmd_38 in "${commands_31[@]}"; do + bold__117_v0 "${cmd_38}" ret_bold117_v0__87_32="${ret_bold117_v0}" echo -e " ${ret_bold117_v0__87_32}" __status=$? @@ -333,38 +333,38 @@ configure_shell__137_v0() { ret_configure_shell137_v0="" return 0 fi - echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_fish_config_38}\"\x1b[0m" + echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_fish_config_35}\"\x1b[0m" __status=$? - refresh_command_35="source ${tilde_fish_config_38}" + refresh_command_32="source ${tilde_fish_config_35}" else - echo "Manually add the directory to ${tilde_fish_config_38} (or similar):" - for cmd_42 in "${commands_34[@]}"; do - bold__117_v0 "${cmd_42}" + echo "Manually add the directory to ${tilde_fish_config_35} (or similar):" + for cmd_39 in "${commands_31[@]}"; do + bold__117_v0 "${cmd_39}" ret_bold117_v0__96_30="${ret_bold117_v0}" echo -e " ${ret_bold117_v0__96_30}" __status=$? done fi elif [ "$([ "_${shell_name}" != "_zsh" ]; echo $?)" != 0 ]; then - zsh_config_43="${home_36}/.zshrc" - tildify__134_v0 "${zsh_config_43}" - tilde_zsh_config_44="${ret_tildify134_v0}" - file_exists__40_v0 "${zsh_config_43}" + zsh_config_40="${home_33}/.zshrc" + tildify__134_v0 "${zsh_config_40}" + tilde_zsh_config_41="${ret_tildify134_v0}" + file_exists__40_v0 "${zsh_config_40}" ret_file_exists40_v0__104_10="${ret_file_exists40_v0}" if [ "${ret_file_exists40_v0__104_10}" != 0 ]; then - content_45=" + content_42=" # ant " - for command_46 in "${commands_34[@]}"; do - content_45+="${command_46} + for command_43 in "${commands_31[@]}"; do + content_42+="${command_43} " done - file_append__43_v0 "${zsh_config_43}" "${content_45}" + file_append__43_v0 "${zsh_config_40}" "${content_42}" __status=$? if [ "${__status}" != 0 ]; then - echo "Manually add the directory to ${tilde_zsh_config_44} (or similar):" - for cmd_47 in "${commands_34[@]}"; do - bold__117_v0 "${cmd_47}" + echo "Manually add the directory to ${tilde_zsh_config_41} (or similar):" + for cmd_44 in "${commands_31[@]}"; do + bold__117_v0 "${cmd_44}" ret_bold117_v0__112_32="${ret_bold117_v0}" echo -e " ${ret_bold117_v0__112_32}" __status=$? @@ -372,59 +372,59 @@ configure_shell__137_v0() { ret_configure_shell137_v0="" return 0 fi - echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_zsh_config_44}\"\x1b[0m" + echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_zsh_config_41}\"\x1b[0m" __status=$? - refresh_command_35="source ${tilde_zsh_config_44}" + refresh_command_32="source ${tilde_zsh_config_41}" else - echo "Manually add the directory to ${tilde_zsh_config_44} (or similar):" - for cmd_48 in "${commands_34[@]}"; do - bold__117_v0 "${cmd_48}" + echo "Manually add the directory to ${tilde_zsh_config_41} (or similar):" + for cmd_45 in "${commands_31[@]}"; do + bold__117_v0 "${cmd_45}" ret_bold117_v0__121_30="${ret_bold117_v0}" echo -e " ${ret_bold117_v0__121_30}" __status=$? done fi elif [ "$([ "_${shell_name}" != "_bash" ]; echo $?)" != 0 ]; then - bash_configs_49=("${home_36}/.bash_profile" "${home_36}/.bashrc") + bash_configs_46=("${home_33}/.bash_profile" "${home_33}/.bashrc") env_var_get__106_v0 "XDG_CONFIG_HOME" __status=$? if [ "${__status}" != 0 ]; then : fi - xdg_config_50="${ret_env_var_get106_v0}" - if [ "$([ "_${xdg_config_50}" == "_" ]; echo $?)" != 0 ]; then - bash_configs_49+=("${xdg_config_50}/.bash_profile" "${xdg_config_50}/.bashrc" "${xdg_config_50}/bash_profile" "${xdg_config_50}/bashrc") + xdg_config_47="${ret_env_var_get106_v0}" + if [ "$([ "_${xdg_config_47}" == "_" ]; echo $?)" != 0 ]; then + bash_configs_46+=("${xdg_config_47}/.bash_profile" "${xdg_config_47}/.bashrc" "${xdg_config_47}/bash_profile" "${xdg_config_47}/bashrc") fi - set_manually_51=1 - for bash_config_52 in "${bash_configs_49[@]}"; do - tildify__134_v0 "${bash_config_52}" - tilde_bash_config_53="${ret_tildify134_v0}" - file_exists__40_v0 "${bash_config_52}" + set_manually_48=1 + for bash_config_49 in "${bash_configs_46[@]}"; do + tildify__134_v0 "${bash_config_49}" + tilde_bash_config_50="${ret_tildify134_v0}" + file_exists__40_v0 "${bash_config_49}" ret_file_exists40_v0__147_12="${ret_file_exists40_v0}" if [ "${ret_file_exists40_v0__147_12}" != 0 ]; then - content_54=" + content_51=" # ant " - for command_55 in "${commands_34[@]}"; do - content_54+="${command_55} + for command_52 in "${commands_31[@]}"; do + content_51+="${command_52} " done - file_append__43_v0 "${bash_config_52}" "${content_54}" + file_append__43_v0 "${bash_config_49}" "${content_51}" __status=$? if [ "${__status}" != 0 ]; then continue fi - echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_bash_config_53}\"\x1b[0m" + echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_bash_config_50}\"\x1b[0m" __status=$? - refresh_command_35="source ${tilde_bash_config_53}" - set_manually_51=0 + refresh_command_32="source ${tilde_bash_config_50}" + set_manually_48=0 break fi done - if [ "${set_manually_51}" != 0 ]; then + if [ "${set_manually_48}" != 0 ]; then echo "Manually add the directory to ~/.bashrc (or similar):" - for cmd_56 in "${commands_34[@]}"; do - bold__117_v0 "${cmd_56}" + for cmd_53 in "${commands_31[@]}"; do + bold__117_v0 "${cmd_53}" ret_bold117_v0__165_30="${ret_bold117_v0}" echo -e " ${ret_bold117_v0__165_30}" __status=$? @@ -441,7 +441,7 @@ configure_shell__137_v0() { echo -e " ${ret_bold117_v0__172_26}" __status=$? fi - ret_configure_shell137_v0="${refresh_command_35}" + ret_configure_shell137_v0="${refresh_command_32}" return 0 } @@ -457,120 +457,99 @@ if [ "$(( ! ${ret_is_command108_v0__184_10} ))" != 0 ]; then echo_error__124_v0 "unzip is required to install ant" 1 fi __length_18=("${args_3[@]}") -if [ "$(( ${#__length_18[@]} > 3 ))" != 0 ]; then - echo_error__124_v0 "Too many arguments. Usage: install.ab [tag] [--mbedtls]" 1 +if [ "$(( ${#__length_18[@]} > 2 ))" != 0 ]; then + echo_error__124_v0 "Too many arguments. Usage: install.ab [tag]" 1 fi get_target__135_v0 target_9="${ret_get_target135_v0}" -env_var_get__106_v0 "MBEDTLS" -__status=$? -if [ "${__status}" != 0 ]; then - : -fi -mbedtls_env_10="${ret_env_var_get106_v0}" -use_mbedtls_11="$([ "_${mbedtls_env_10}" == "_" ]; echo $?)" -for arg_12 in "${args_3[@]}"; do - if [ "$([ "_${arg_12}" != "_--mbedtls" ]; echo $?)" != 0 ]; then - use_mbedtls_11=1 - fi -done -if [ "${use_mbedtls_11}" != 0 ]; then - starts_with__23_v0 "${target_9}" "darwin" - ret_starts_with23_v0__202_8="${ret_starts_with23_v0}" - if [ "${ret_starts_with23_v0__202_8}" != 0 ]; then - target_9="${target_9}-mbedtls" - else - echo_error__124_v0 "--mbedtls option is only supported on macOS" 1 - fi -fi env_var_get__106_v0 "GITHUB" __status=$? if [ "${__status}" != 0 ]; then : fi -github_13="${ret_env_var_get106_v0}" -if [ "$([ "_${github_13}" != "_" ]; echo $?)" != 0 ]; then - github_13="https://github.com" +github_10="${ret_env_var_get106_v0}" +if [ "$([ "_${github_10}" != "_" ]; echo $?)" != 0 ]; then + github_10="https://github.com" fi -github_repo_14="${github_13}/themackabu/ant" -ant_uri_15="" -tag_16="" -for arg_17 in "${args_3[@]}"; do - if [ "$(( $([ "_${arg_17}" == "_--mbedtls" ]; echo $?) && $([ "_${arg_17}" == "_${args_3[0]}" ]; echo $?) ))" != 0 ]; then - tag_16="${arg_17}" +github_repo_11="${github_10}/themackabu/ant" +ant_uri_12="" +tag_13="" +for arg_14 in "${args_3[@]}"; do + if [ "$([ "_${arg_14}" == "_${args_3[0]}" ]; echo $?)" != 0 ]; then + tag_13="${arg_14}" fi done -if [ "$([ "_${tag_16}" != "_" ]; echo $?)" != 0 ]; then - ant_uri_15="${github_repo_14}/releases/latest/download/ant-${target_9}.zip" +if [ "$([ "_${tag_13}" != "_" ]; echo $?)" != 0 ]; then + ant_uri_12="${github_repo_11}/releases/latest/download/ant-${target_9}.zip" else - ant_uri_15="${github_repo_14}/releases/download/${tag_16}/ant-${target_9}.zip" + ant_uri_12="${github_repo_11}/releases/download/${tag_13}/ant-${target_9}.zip" fi -install_env_18="ANT_INSTALL" -bin_env_19="\$${install_env_18}/bin" +install_env_15="ANT_INSTALL" +bin_env_16="\$${install_env_15}/bin" env_var_get__106_v0 "HOME" __status=$? if [ "${__status}" != 0 ]; then echo_error__124_v0 "HOME environment variable not set" 1 fi -home_20="${ret_env_var_get106_v0}" +home_17="${ret_env_var_get106_v0}" env_var_get__106_v0 "ANT_INSTALL" __status=$? if [ "${__status}" != 0 ]; then : fi -env_install_21="${ret_env_var_get106_v0}" -install_dir_22="$(if [ "$([ "_${env_install_21}" == "_" ]; echo $?)" != 0 ]; then echo "${env_install_21}"; else echo "${home_20}/.ant"; fi)" -bin_dir_23="${install_dir_22}/bin" -exe_24="${bin_dir_23}/ant" -dir_exists__39_v0 "${bin_dir_23}" -ret_dir_exists39_v0__243_10="${ret_dir_exists39_v0}" -if [ "$(( ! ${ret_dir_exists39_v0__243_10} ))" != 0 ]; then - dir_create__45_v0 "${bin_dir_23}" +env_install_18="${ret_env_var_get106_v0}" +install_dir_19="$(if [ "$([ "_${env_install_18}" == "_" ]; echo $?)" != 0 ]; then echo "${env_install_18}"; else echo "${home_17}/.ant"; fi)" +bin_dir_20="${install_dir_19}/bin" +exe_21="${bin_dir_20}/ant" +dir_exists__39_v0 "${bin_dir_20}" +ret_dir_exists39_v0__228_10="${ret_dir_exists39_v0}" +if [ "$(( ! ${ret_dir_exists39_v0__228_10} ))" != 0 ]; then + dir_create__45_v0 "${bin_dir_20}" __status=$? if [ "${__status}" != 0 ]; then - echo_error__124_v0 "Failed to create install directory \"${bin_dir_23}\"" 1 + echo_error__124_v0 "Failed to create install directory \"${bin_dir_20}\"" 1 fi fi -curl --fail --location --progress-bar --output "${exe_24}.zip" "${ant_uri_15}" +curl --fail --location --progress-bar --output "${exe_21}.zip" "${ant_uri_12}" __status=$? if [ "${__status}" != 0 ]; then - echo_error__124_v0 "Failed to download ant from \"${ant_uri_15}\"" 1 + echo_error__124_v0 "Failed to download ant from \"${ant_uri_12}\"" 1 fi -unzip -oqd "${bin_dir_23}" "${exe_24}.zip" +unzip -oqd "${bin_dir_20}" "${exe_21}.zip" __status=$? if [ "${__status}" != 0 ]; then echo_error__124_v0 "Failed to extract ant" 1 fi -file_chmod__48_v0 "${exe_24}" "755" +file_chmod__48_v0 "${exe_21}" "755" __status=$? if [ "${__status}" != 0 ]; then echo_error__124_v0 "Failed to set permissions on ant executable" 1 fi -rm "${exe_24}.zip" +rm "${exe_21}.zip" __status=$? if [ "${__status}" != 0 ]; then echo_error__124_v0 "Failed to clean up zip file" 1 fi -tildify__134_v0 "${exe_24}" -ret_tildify134_v0__265_78="${ret_tildify134_v0}" -array_19=("${ret_tildify134_v0__265_78}") +tildify__134_v0 "${exe_21}" +ret_tildify134_v0__250_78="${ret_tildify134_v0}" +array_19=("${ret_tildify134_v0__250_78}") printf__114_v0 "\\x1b[32mant was installed successfully to \\x1b[1;32m%s\\x1b[0m " array_19[@] is_command__108_v0 "ant" -ret_is_command108_v0__267_6="${ret_is_command108_v0}" -if [ "${ret_is_command108_v0__267_6}" != 0 ]; then +ret_is_command108_v0__252_6="${ret_is_command108_v0}" +if [ "${ret_is_command108_v0__252_6}" != 0 ]; then echo "Run 'ant --help' to get started" exit 0 __status=$? fi -tildify__134_v0 "${bin_dir_23}" -tilde_bin_dir_30="${ret_tildify134_v0}" -quoted_install_dir_31="\"${install_dir_22}\"" -starts_with__23_v0 "${install_dir_22}" "${home_20}" -ret_starts_with23_v0__275_6="${ret_starts_with23_v0}" -if [ "${ret_starts_with23_v0__275_6}" != 0 ]; then - replace__1_v0 "${quoted_install_dir_31}" "${home_20}" "\$HOME" - quoted_install_dir_31="${ret_replace1_v0}" +tildify__134_v0 "${bin_dir_20}" +tilde_bin_dir_27="${ret_tildify134_v0}" +quoted_install_dir_28="\"${install_dir_19}\"" +starts_with__23_v0 "${install_dir_19}" "${home_17}" +ret_starts_with23_v0__260_6="${ret_starts_with23_v0}" +if [ "${ret_starts_with23_v0__260_6}" != 0 ]; then + replace__1_v0 "${quoted_install_dir_28}" "${home_17}" "\$HOME" + quoted_install_dir_28="${ret_replace1_v0}" fi echo "" env_var_get__106_v0 "SHELL" @@ -578,22 +557,22 @@ __status=$? if [ "${__status}" != 0 ]; then : fi -shell_path_32="${ret_env_var_get106_v0}" -command_20="$(basename "${shell_path_32}")" +shell_path_29="${ret_env_var_get106_v0}" +command_20="$(basename "${shell_path_29}")" __status=$? -shell_name_33="${command_20}" -configure_shell__137_v0 "${shell_name_33}" "${install_env_18}" "${quoted_install_dir_31}" "${bin_env_19}" "${tilde_bin_dir_30}" -refresh_command_57="${ret_configure_shell137_v0}" +shell_name_30="${command_20}" +configure_shell__137_v0 "${shell_name_30}" "${install_env_15}" "${quoted_install_dir_28}" "${bin_env_16}" "${tilde_bin_dir_27}" +refresh_command_54="${ret_configure_shell137_v0}" echo "" echo -e "\x1b[2mTo get started, run:\x1b[0m" __status=$? -if [ "$([ "_${refresh_command_57}" == "_" ]; echo $?)" != 0 ]; then - bold__117_v0 "${refresh_command_57}" - ret_bold117_v0__291_24="${ret_bold117_v0}" - echo -e " ${ret_bold117_v0__291_24}" +if [ "$([ "_${refresh_command_54}" == "_" ]; echo $?)" != 0 ]; then + bold__117_v0 "${refresh_command_54}" + ret_bold117_v0__276_24="${ret_bold117_v0}" + echo -e " ${ret_bold117_v0__276_24}" __status=$? fi bold__117_v0 "ant --help" -ret_bold117_v0__294_22="${ret_bold117_v0}" -echo -e " ${ret_bold117_v0__294_22}" +ret_bold117_v0__279_22="${ret_bold117_v0}" +echo -e " ${ret_bold117_v0__279_22}" __status=$? diff --git a/.github/versions.json b/.github/versions.json index e2c8611..cf40fe3 100644 --- a/.github/versions.json +++ b/.github/versions.json @@ -6,7 +6,6 @@ }, "dependencies": { "libsodium": "1.0.20", - "mbedtls": "3.6.5", "zlib": "1.3.1" }, "targets": { diff --git a/.github/workflows/build-platform.yml b/.github/workflows/build-platform.yml index efb2600..c38a2ae 100644 --- a/.github/workflows/build-platform.yml +++ b/.github/workflows/build-platform.yml @@ -7,11 +7,6 @@ on: description: 'Platform key from versions.json targets' required: true type: string - tls_library: - description: 'TLS library (openssl or mbedtls)' - required: false - type: string - default: 'openssl' build_timestamp: required: true type: string @@ -98,9 +93,7 @@ jobs: for pkg in meson ninja llvm jq; do brew list "$pkg" &>/dev/null || brew install "$pkg" done - if [[ "${{ inputs.tls_library }}" != "mbedtls" ]]; then - brew list openssl@3 &>/dev/null || brew install openssl@3 - fi + brew list openssl@3 &>/dev/null || brew install openssl@3 # === WINDOWS SETUP === - name: Disable Windows Defender real-time monitoring @@ -153,27 +146,14 @@ jobs: echo "cmake_generator=$(echo $CONFIG | jq -r '.cmake_generator // empty')" >> $GITHUB_OUTPUT echo "extra_meson_args=$(echo $CONFIG | jq -r '.extra_meson_args // empty')" >> $GITHUB_OUTPUT - # TLS library from workflow input (overrides versions.json) - TLS_LIBRARY="${{ inputs.tls_library }}" - echo "tls_library=$TLS_LIBRARY" >> $GITHUB_OUTPUT - - # Artifact name: append -mbedtls suffix when using mbedtls ARTIFACT_NAME=$(echo $CONFIG | jq -r '.artifact_name') - if [[ "$TLS_LIBRARY" == "mbedtls" ]]; then - ARTIFACT_NAME="${ARTIFACT_NAME}-mbedtls" - fi echo "artifact_name=$ARTIFACT_NAME" >> $GITHUB_OUTPUT - # Deps: add mbedtls to deps list when using mbedtls DEPS_LIST=$(echo $CONFIG | jq -r '.deps | join(" ")') - if [[ "$TLS_LIBRARY" == "mbedtls" ]]; then - DEPS_LIST="$DEPS_LIST mbedtls" - fi echo "deps=$DEPS_LIST" >> $GITHUB_OUTPUT # Dep versions echo "libsodium_version=$(echo $DEPS | jq -r '.libsodium')" >> $GITHUB_OUTPUT - echo "mbedtls_version=$(echo $DEPS | jq -r '.mbedtls')" >> $GITHUB_OUTPUT echo "zlib_version=$(echo $DEPS | jq -r '.zlib')" >> $GITHUB_OUTPUT # === SETUP ZIG === @@ -213,7 +193,6 @@ jobs: ranlib: ${{ steps.llvm.outputs.ranlib }} cmake_generator: ${{ steps.config.outputs.cmake_generator }} libsodium_version: ${{ steps.config.outputs.libsodium_version }} - mbedtls_version: ${{ steps.config.outputs.mbedtls_version }} zlib_version: ${{ steps.config.outputs.zlib_version }} # === BUILD PROJECT === @@ -229,7 +208,6 @@ jobs: strip: ${{ steps.llvm.outputs.strip }} deps_prefix: ${{ github.workspace }}/.deps-cache build_timestamp: ${{ inputs.build_timestamp }} - tls_library: ${{ steps.config.outputs.tls_library }} static_link: ${{ steps.config.outputs.static_link }} extra_meson_args: ${{ steps.config.outputs.extra_meson_args }} binary_name: ${{ steps.config.outputs.binary_name }} diff --git a/.github/workflows/build-single.yml b/.github/workflows/build-single.yml index 0da71f0..b825606 100644 --- a/.github/workflows/build-single.yml +++ b/.github/workflows/build-single.yml @@ -15,14 +15,6 @@ on: - macos-x64 - macos-aarch64 - windows-x64 - tls_library: - description: 'TLS library' - required: false - type: choice - default: 'openssl' - options: - - openssl - - mbedtls jobs: prepare: @@ -38,5 +30,4 @@ jobs: uses: ./.github/workflows/build-platform.yml with: platform: ${{ inputs.platform }} - tls_library: ${{ inputs.tls_library }} build_timestamp: ${{ needs.prepare.outputs.timestamp }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d0e99f..ca3bb3b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,30 +44,11 @@ jobs: platform: ${{ matrix.platform }} build_timestamp: ${{ needs.prepare.outputs.timestamp }} - build-mbedtls: - needs: prepare - strategy: - fail-fast: false - matrix: - platform: - - linux-glibc-x64 - - linux-glibc-aarch64 - - linux-musl-x64 - - linux-musl-aarch64 - - macos-x64 - - macos-aarch64 - - windows-x64 - uses: ./.github/workflows/build-platform.yml - with: - platform: ${{ matrix.platform }} - tls_library: mbedtls - build_timestamp: ${{ needs.prepare.outputs.timestamp }} - summary: name: Version - needs: [build, build-mbedtls] + needs: [build] runs-on: ubuntu-latest - if: ${{ !cancelled() && (needs.build.result != 'skipped' || needs.build-mbedtls.result != 'skipped') }} + if: ${{ !cancelled() && needs.build.result != 'skipped' }} steps: - name: Download version artifacts uses: actions/download-artifact@v4 diff --git a/BUILDING.md b/BUILDING.md index 89d6146..6440487 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -44,10 +44,8 @@ produced for each platform listed below. | GNU/Linux | aarch64 | glibc | No | Ubuntu 22.04 (CI) | | GNU/Linux | x64 | musl | Yes | Alpine Edge (CI) | | GNU/Linux | aarch64 | musl | Yes | Alpine Edge (CI) | -| macOS | x64 | openssl | No | macOS 15 (CI) | -| macOS | aarch64 | openssl | No | macOS 15 (CI) | -| macOS | x64 | mbedtls | No | macOS 15 (CI) | -| macOS | aarch64 | mbedtls | No | macOS 15 (CI) | +| macOS | x64 | darwin | No | macOS 15 (CI) | +| macOS | aarch64 | darwin | No | macOS 15 (CI) | | Windows | x64 | mingw/msys | No | MSYS2 MINGW64 toolchain (CI) | ### Supported toolchains @@ -65,17 +63,15 @@ C23 support is required. CI binaries are produced using: -| Binary package | Platform and Toolchain | -| -------------------------- | -------------------------------------------- | -| ant-linux-x64 | Ubuntu 22.04 (glibc), LLVM/Clang | -| ant-linux-aarch64 | Ubuntu 22.04 (glibc), LLVM/Clang | -| ant-linux-x64-musl | Alpine Edge (musl), statically linked, Clang | -| ant-linux-aarch64-musl | Alpine Edge (musl), statically linked, Clang | -| ant-darwin-x64 | macOS 15 Intel, LLVM/Clang | -| ant-darwin-aarch64 | macOS 15 ARM, LLVM/Clang | -| ant-darwin-x64-mbedtls | macOS 15 Intel, LLVM/Clang, mbedTLS | -| ant-darwin-aarch64-mbedtls | macOS 15 ARM, LLVM/Clang, mbedTLS | -| ant-windows-x64 | MSYS2 MINGW64 toolchain | +| Binary package | Platform and Toolchain | +| ---------------------- | -------------------------------------------- | +| ant-linux-x64 | Ubuntu 22.04 (glibc), LLVM/Clang | +| ant-linux-aarch64 | Ubuntu 22.04 (glibc), LLVM/Clang | +| ant-linux-x64-musl | Alpine Edge (musl), statically linked, Clang | +| ant-linux-aarch64-musl | Alpine Edge (musl), statically linked, Clang | +| ant-darwin-x64 | macOS 15 Intel, LLVM/Clang | +| ant-darwin-aarch64 | macOS 15 ARM, LLVM/Clang | +| ant-windows-x64 | MSYS2 MINGW64 toolchain | ## Building Ant on supported platforms @@ -94,7 +90,7 @@ The following tools are required to build Ant regardless of platform: System libraries required: -- **OpenSSL** (default) or **mbedTLS** (alternative TLS backend) +- **OpenSSL** - **libsodium** - **libuuid** (Linux/macOS) - **llhttp** (if not building from source via cmake) @@ -419,12 +415,11 @@ To verify: Configure options are set via `meson setup` or `meson configure`: -| Option | Type | Default | Description | -| ------------------- | ------- | --------- | ------------------------------------------ | -| `static_link` | boolean | `false` | Statically link the final binary | -| `build_timestamp` | string | (auto) | Build timestamp (defaults to current time) | -| `tls_library` | combo | `openssl` | TLS backend: `openssl` or `mbedtls` | -| `deps_prefix_cmake` | string | (empty) | Prefix path for cmake dependency lookup | +| Option | Type | Default | Description | +| ------------------- | ------- | ------- | ------------------------------------------ | +| `static_link` | boolean | `false` | Statically link the final binary | +| `build_timestamp` | string | (auto) | Build timestamp (defaults to current time) | +| `deps_prefix_cmake` | string | (empty) | Prefix path for cmake dependency lookup | Standard Meson built-in options used by Ant: @@ -441,22 +436,5 @@ Standard Meson built-in options used by Ant: Example: ```bash -meson setup build -Dtls_library=mbedtls -Dstatic_link=true --prefer-static +meson setup build -Dstatic_link=true --prefer-static ``` - -## TLS library selection - -Ant supports two TLS backends: - -- **OpenSSL** (default): Widely available, used on all platforms by default. -- **mbedTLS**: Lighter alternative, useful for embedded or constrained - environments. Currently only tested on macOS CI. - -To build with mbedTLS: - -```bash -meson setup build -Dtls_library=mbedtls -``` - -When using mbedTLS, the target triple in the version string will include -`-mbedtls` as a suffix. diff --git a/README.md b/README.md index b1cecb0..f57f2fa 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,6 @@ The engine, Ant Silver is hand-built, not a wrapper around V8, JSC, or SpiderMon ```bash curl -fsSL https://ant.themackabu.com/install | bash - -# or with MbedTLS -curl -fsSL https://ant.themackabu.com/install | MBEDTLS=1 bash ``` ## Spec conformance diff --git a/libant/meson_options.txt b/libant/meson_options.txt index f46fef7..cd31ef4 100644 --- a/libant/meson_options.txt +++ b/libant/meson_options.txt @@ -1,5 +1,4 @@ option('jit', type: 'boolean', value: true, description: 'enable JIT compiler') option('build_timestamp', type: 'string', value: '', description: 'build timestamp (defaults to current time if empty)') -option('tls_library', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl', description: 'TLS library to use') option('deps_prefix_cmake', type: 'string', value: '', description: 'prefix path for finding dependencies in cmake subprojects') option('lto', type: 'boolean', value: true, description: 'also build LTO version (libant-lto.a)') diff --git a/libant/scripts/compile.sh b/libant/scripts/compile.sh index b74c675..98a02e6 100755 --- a/libant/scripts/compile.sh +++ b/libant/scripts/compile.sh @@ -20,5 +20,5 @@ mkdir -p "$BUILD_DIR/vendor/$tlsuv_dir" rm -rf "$tlsuv_prefix" cp -RL "$BUILD_DIR/deps" "$tlsuv_prefix" -meson setup build --prefer-static -Dtls_library=mbedtls -Ddeps_prefix_cmake="$tlsuv_prefix" "$@" +meson setup build --prefer-static -Ddeps_prefix_cmake="$tlsuv_prefix" "$@" meson compile -C build diff --git a/libant/scripts/deps.sh b/libant/scripts/deps.sh index c8dccba..6b54b19 100755 --- a/libant/scripts/deps.sh +++ b/libant/scripts/deps.sh @@ -6,7 +6,6 @@ set -e build_deps() { if [ -f "$DEPS_DIR/lib/libllhttp.a" ] && \ [ -f "$DEPS_DIR/lib/libz.a" ] && \ - [ -f "$DEPS_DIR/lib/libmbedtls.a" ] && \ [ -f "$DEPS_DIR/lib/libsodium.a" ]; then echo "Dependencies already built, skipping..." return @@ -43,22 +42,6 @@ build_deps() { rm -f "$DEPS_DIR/lib/libz.so"* "$DEPS_DIR/lib/libz.dylib"* 2>/dev/null || true fi - if [ ! -f "$DEPS_DIR/lib/libmbedtls.a" ]; then - echo "Building mbedTLS..." - rm -rf "$CACHE_DIR/mbedtls" - git clone --depth 1 --branch mbedtls-3.6.5 --recurse-submodules https://github.com/Mbed-TLS/mbedtls.git "$CACHE_DIR/mbedtls" - cd "$CACHE_DIR/mbedtls" - cmake -B build \ - -DCMAKE_INSTALL_PREFIX="$DEPS_DIR" \ - -DENABLE_PROGRAMS=OFF \ - -DENABLE_TESTING=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_STATIC_MBEDTLS_LIBRARY=ON \ - -DUSE_SHARED_MBEDTLS_LIBRARY=OFF - cmake --build build -j$NCPU - cmake --install build - fi - if [ ! -f "$DEPS_DIR/lib/libsodium.a" ]; then echo "Building libsodium..." rm -rf "$CACHE_DIR/libsodium" diff --git a/meson/deps/meson.build b/meson/deps/meson.build index efce5ea..257ab7c 100644 --- a/meson/deps/meson.build +++ b/meson/deps/meson.build @@ -1,18 +1,6 @@ cc = meson.get_compiler('c') -tls_lib = get_option('tls_library') - -if tls_lib == 'openssl' - openssl_dep = dependency('openssl', required: true, static: is_static) - mbedtls_dep = [] -else - openssl_dep = dependency('', required: false) - mbedtls_dep = [ - dependency('mbedtls', required: true, static: is_static), - dependency('mbedx509', required: true, static: is_static), - dependency('mbedcrypto', required: true, static: is_static), - ] -endif +openssl_dep = dependency('openssl', required: true, static: is_static) libsodium_dep = dependency('libsodium', required: true, static: is_static) if host_machine.system() == 'windows' @@ -89,7 +77,7 @@ brotli_enc_dep = brotli_sub.get_variable('brotli_encoder_dep') cmake_prefix = get_option('deps_prefix_cmake') tlsuv_sub = subproject('tlsuv', default_options: [ - 'tls_backend=' + tls_lib, + 'tls_backend=openssl', 'deps_prefix_cmake=' + cmake_prefix, 'warning_level=0', ]) @@ -216,7 +204,7 @@ ant_deps = [ uriparser_dep, utf8proc_dep, openssl_dep, zlib_dep, brotli_common_dep, brotli_dec_dep, brotli_enc_dep, uthash_dep, lmdb_dep, wamr_dep, -] + mbedtls_dep + win_deps +] + win_deps if get_option('jit') mir_dep = subproject('mir').get_variable('mir_dep') diff --git a/meson/snapshot/meson.build b/meson/snapshot/meson.build index d3815a7..fff4186 100644 --- a/meson/snapshot/meson.build +++ b/meson/snapshot/meson.build @@ -18,7 +18,6 @@ snapshot_h = custom_target( 'GIT_HASH=' + git_hash, 'BUILD_TIMESTAMP=' + timestamp, 'TARGET=' + target_triple, - 'MBEDTLS=' + (tls_lib == 'mbedtls').to_string(), 'HOST=' + host_machine.system(), ], ) diff --git a/meson/version/meson.build b/meson/version/meson.build index d0b9224..7ecf744 100644 --- a/meson/version/meson.build +++ b/meson/version/meson.build @@ -16,8 +16,6 @@ if triple_parts.length() == 4 and triple_parts[1] != 'unknown' and triple_parts[ target_triple = triple_parts[0] + '-unknown-' + triple_parts[2] + '-' + triple_parts[3] endif -target_triple = target_triple + (tls_lib == 'mbedtls' ? '-mbedtls' : '') - add_project_arguments( '-DANT_VERSION="' + ant_version + '"', '-DANT_BUILD_TIMESTAMP=' + timestamp, diff --git a/meson_options.txt b/meson_options.txt index 0a726a4..2703137 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,4 @@ option('jit', type: 'boolean', value: true, description: 'enable JIT compiler') option('static_link', type: 'boolean', value: false, description: 'statically link the binary') -option('tls_library', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl', description: 'TLS library to use') option('build_timestamp', type: 'string', value: '', description: 'build timestamp (defaults to current time if empty)') option('deps_prefix_cmake', type: 'string', value: '', description: 'prefix path for finding dependencies in cmake subprojects') diff --git a/src/core/features.ts b/src/core/features.ts index e957987..7a6c529 100644 --- a/src/core/features.ts +++ b/src/core/features.ts @@ -1,6 +1,6 @@ process.features = { uv: true, - tls_mbedtls: import.meta.env.MBEDTLS as unknown as boolean, + tls: 'openssl', typescript: 'transform' }; diff --git a/src/types/process.d.ts b/src/types/process.d.ts index cc2a228..96ebfdc 100644 --- a/src/types/process.d.ts +++ b/src/types/process.d.ts @@ -7,13 +7,16 @@ type ProcessEnv = { interface Features { uv: boolean; - tls_mbedtls: boolean; + tls: string; typescript: 'transform' | 'none'; } interface Versions { + node: string; ant: string; + v8: string; uv: string; + modules: string; } interface Release { diff --git a/vendor/packagefiles/patches/tlsuv-fix-fd-type.patch b/vendor/packagefiles/patches/tlsuv-fix-fd-type.patch deleted file mode 100644 index 7af04df..0000000 --- a/vendor/packagefiles/patches/tlsuv-fix-fd-type.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/mbedtls/engine.c -+++ b/src/mbedtls/engine.c -@@ -111,7 +111,7 @@ - tlsuv_engine_t new_mbedtls_engine(tls_context *ctx, const char *host); - - static void mbedtls_set_io(tlsuv_engine_t, io_ctx , io_read , io_write ); --static void mbedtls_set_fd(tlsuv_engine_t, uv_os_fd_t ); -+static void mbedtls_set_fd(tlsuv_engine_t, tlsuv_sock_t ); - - static tls_handshake_state mbedtls_hs_state(tlsuv_engine_t engine); - static tls_handshake_state -@@ -701,10 +701,10 @@ - mbedtls_ssl_set_bio(eng->ssl, eng, engine_io_write, engine_io_read, NULL); - } - --static void mbedtls_set_fd(tlsuv_engine_t e, uv_os_fd_t fd) { -+static void mbedtls_set_fd(tlsuv_engine_t e, tlsuv_sock_t fd) { - struct mbedtls_engine *eng = (struct mbedtls_engine *) e; - assert(eng->io == NULL); -- eng->io_fd = fd; -+ eng->io_fd = (uv_os_fd_t)fd; - eng->io = &eng->io_fd; - mbedtls_ssl_set_bio(eng->ssl, eng->io, mbedtls_net_send, mbedtls_net_recv, NULL); - } diff --git a/vendor/packagefiles/tlsuv/meson.build b/vendor/packagefiles/tlsuv/meson.build index b62a9cc..7831e4b 100644 --- a/vendor/packagefiles/tlsuv/meson.build +++ b/vendor/packagefiles/tlsuv/meson.build @@ -47,25 +47,16 @@ elif host_machine.system() == 'windows' tlsuv_sources += files('src/win32/win32_keychain.c') endif -if tls_backend == 'openssl' - tlsuv_sources += files('src/openssl/engine.c', 'src/openssl/keys.c') -elif tls_backend == 'mbedtls' - tlsuv_sources += files('src/mbedtls/engine.c', 'src/mbedtls/keys.c') -endif +tlsuv_sources += files('src/openssl/engine.c', 'src/openssl/keys.c') tlsuv_c_args = [ '-DTLSUV_VERSION=v' + meson.project_version(), '-DTLSUV_HTTP', '-DTLS_IMPL=' + tls_backend, + '-DUSE_OPENSSL', '-w', ] -if tls_backend == 'openssl' - tlsuv_c_args += '-DUSE_OPENSSL' -elif tls_backend == 'mbedtls' - tlsuv_c_args += '-DUSE_MBEDTLS' -endif - if cmake_prefix != '' tlsuv_c_args += ['-I' + cmake_prefix / 'include'] endif @@ -78,11 +69,8 @@ elif host_machine.system() == 'linux' tlsuv_c_args += ['-D_POSIX_C_SOURCE=200112', '-D_GNU_SOURCE'] endif -tls_dep = [] -if tls_backend == 'openssl' - tls_dep = dependency('openssl', required: true) - tlsuv_c_args += ['-I' + tls_dep.get_variable(pkgconfig: 'includedir')] -endif +tls_dep = dependency('openssl', required: true) +tlsuv_c_args += ['-I' + tls_dep.get_variable(pkgconfig: 'includedir')] win_deps = [] if host_machine.system() == 'windows' diff --git a/vendor/packagefiles/tlsuv/meson_options.txt b/vendor/packagefiles/tlsuv/meson_options.txt index 967abc8..c52a38b 100644 --- a/vendor/packagefiles/tlsuv/meson_options.txt +++ b/vendor/packagefiles/tlsuv/meson_options.txt @@ -1,2 +1,2 @@ -option('tls_backend', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl', description: 'TLS backend library') +option('tls_backend', type: 'combo', choices: ['openssl'], value: 'openssl', description: 'TLS backend library') option('deps_prefix_cmake', type: 'string', value: '', description: 'Prefix for cmake-built dependencies') -- 2.51.2