MIRROR: javascript for ๐Ÿœ's, a tiny runtime with big ambitions
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kill mbedtls and prep for boringssl

+161 -379
+2 -33
.github/actions/build-native-deps/action.yml
··· 1 1 name: Build Native Dependencies 2 - description: Build libsodium, mbedtls, zlib as needed 2 + description: Build libsodium and zlib as needed 3 3 4 4 inputs: 5 5 deps: 6 - description: Space-separated list of deps to build (libsodium mbedtls zlib) 6 + description: Space-separated list of deps to build (libsodium zlib) 7 7 required: true 8 8 prefix: 9 9 description: Install prefix ··· 28 28 required: false 29 29 default: '' 30 30 libsodium_version: 31 - required: true 32 - mbedtls_version: 33 31 required: true 34 32 zlib_version: 35 33 required: true ··· 71 69 ./configure CC=${{ inputs.cc }} --prefix=${{ steps.prep.outputs.prefix }} --disable-shared --enable-static 72 70 make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4) 73 71 make install 74 - 75 - - name: Build mbedtls 76 - if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.deps, 'mbedtls') 77 - shell: bash 78 - run: | 79 - if [[ "$RUNNER_OS" == "Windows" ]]; then 80 - export PATH="$(cygpath "$RUNNER_TEMP/msys64/clang64/bin"):$PATH" 81 - fi 82 - git clone --depth 1 --branch mbedtls-${{ inputs.mbedtls_version }} --recurse-submodules https://github.com/Mbed-TLS/mbedtls.git /tmp/mbedtls 83 - cd /tmp/mbedtls 84 - CMAKE_GENERATOR="${{ inputs.cmake_generator }}" 85 - CMAKE_ARGS="-DCMAKE_C_COMPILER=${{ inputs.cc }}" 86 - if [[ "$RUNNER_OS" == "Windows" ]]; then 87 - AR_PATH="$(which ${{ inputs.ar }})" 88 - RANLIB_PATH="$(which ${{ inputs.ranlib }})" 89 - CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_AR=$AR_PATH -DCMAKE_RANLIB=$RANLIB_PATH" 90 - fi 91 - if [[ -n "${{ inputs.cxx }}" ]]; then 92 - CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_COMPILER=${{ inputs.cxx }}" 93 - fi 94 - cmake -B build \ 95 - ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \ 96 - $CMAKE_ARGS \ 97 - -DCMAKE_INSTALL_PREFIX=${{ steps.prep.outputs.prefix }} \ 98 - -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF \ 99 - -DCMAKE_BUILD_TYPE=Release \ 100 - -DUSE_STATIC_MBEDTLS_LIBRARY=ON -DUSE_SHARED_MBEDTLS_LIBRARY=OFF 101 - cmake --build build -j$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4) 102 - cmake --install build 103 72 104 73 - name: Build zlib 105 74 if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.deps, 'zlib')
-8
.github/actions/build-project/action.yml
··· 36 36 build_timestamp: 37 37 description: Build timestamp 38 38 required: true 39 - tls_library: 40 - description: TLS library (openssl or mbedtls) 41 - required: false 42 - default: 'openssl' 43 39 static_link: 44 40 description: Enable static linking 45 41 required: false ··· 109 105 MESON_ARGS="-Db_lto=true --buildtype=release" 110 106 MESON_ARGS="$MESON_ARGS -Dbuild_timestamp=${{ inputs.build_timestamp }}" 111 107 MESON_ARGS="$MESON_ARGS -Ddeps_prefix_cmake=$DEPS_PREFIX" 112 - 113 - if [[ "${{ inputs.tls_library }}" == "mbedtls" ]]; then 114 - MESON_ARGS="$MESON_ARGS -Dtls_library=mbedtls" 115 - fi 116 108 117 109 if [[ "${{ inputs.static_link }}" == "true" ]]; then 118 110 MESON_ARGS="$MESON_ARGS --prefer-static -Dstatic_link=true"
+3 -18
.github/install/install.ab
··· 185 185 echo_error("unzip is required to install ant") 186 186 } 187 187 188 - if len(args) > 3 { 189 - echo_error("Too many arguments. Usage: install.ab [tag] [--mbedtls]") 188 + if len(args) > 2 { 189 + echo_error("Too many arguments. Usage: install.ab [tag]") 190 190 } 191 191 192 192 let target = get_target() 193 193 194 - let mbedtls_env = env_var_get("MBEDTLS") failed { "" } 195 - let use_mbedtls = mbedtls_env != "" 196 - 197 - for arg in args { 198 - if arg == "--mbedtls" { use_mbedtls = true } 199 - } 200 - 201 - if use_mbedtls { 202 - if starts_with(target, "darwin") { 203 - target = "{target}-mbedtls" 204 - } else { 205 - echo_error("--mbedtls option is only supported on macOS") 206 - } 207 - } 208 - 209 194 let github = env_var_get("GITHUB") failed { 210 195 "https://github.com" 211 196 } ··· 217 202 let ant_uri = "" 218 203 let tag = "" 219 204 for arg in args { 220 - if arg != "--mbedtls" and arg != args[0] { tag = arg } 205 + if arg != args[0] { tag = arg } 221 206 } 222 207 223 208 if tag == "" {
+121 -142
.github/install/install.sh
··· 3 3 # Source: https://github.com/theMackabu/ant/blob/master/.github/install/install.ab 4 4 5 5 bash_version__0_v0() { 6 - major_27="$(echo "${BASH_VERSINFO[0]}")" 7 - minor_28="$(echo "${BASH_VERSINFO[1]}")" 6 + major_24="$(echo "${BASH_VERSINFO[0]}")" 7 + minor_25="$(echo "${BASH_VERSINFO[1]}")" 8 8 command_2="$(echo "${BASH_VERSINFO[2]}")" 9 9 __status=$? 10 - patch_29="${command_2}" 11 - ret_bash_version0_v0=("${major_27}" "${minor_28}" "${patch_29}") 10 + patch_26="${command_2}" 11 + ret_bash_version0_v0=("${major_24}" "${minor_25}" "${patch_26}") 12 12 return 0 13 13 } 14 14 ··· 16 16 local source=$1 17 17 local search=$2 18 18 local replace=$3 19 - result_26="" 19 + result_23="" 20 20 bash_version__0_v0 21 21 left_comp=("${ret_bash_version0_v0[@]}") 22 22 right_comp=(4 3) ··· 36 36 (( "${#left_comp[@]}" == "${#right_comp[@]}" || "${#left_comp[@]}" > "${#right_comp[@]}" )) && echo 1 || echo 0 37 37 )" 38 38 if [ "${comp}" != 0 ]; then 39 - result_26="${source//"${search}"/"${replace}"}" 39 + result_23="${source//"${search}"/"${replace}"}" 40 40 __status=$? 41 41 else 42 - result_26="${source//"${search}"/${replace}}" 42 + result_23="${source//"${search}"/${replace}}" 43 43 __status=$? 44 44 fi 45 - ret_replace1_v0="${result_26}" 45 + ret_replace1_v0="${result_23}" 46 46 return 0 47 47 } 48 48 ··· 201 201 ret_tildify134_v0="${path}" 202 202 return 0 203 203 fi 204 - home_25="${ret_env_var_get106_v0}" 205 - starts_with__23_v0 "${path}" "${home_25}" 204 + home_22="${ret_env_var_get106_v0}" 205 + starts_with__23_v0 "${path}" "${home_22}" 206 206 ret_starts_with23_v0__9_6="${ret_starts_with23_v0}" 207 207 if [ "${ret_starts_with23_v0__9_6}" != 0 ]; then 208 - replace__1_v0 "${path}" "${home_25}" "~" 208 + replace__1_v0 "${path}" "${home_22}" "~" 209 209 ret_tildify134_v0="${ret_replace1_v0}" 210 210 return 0 211 211 fi ··· 297 297 local bin_env=$4 298 298 local tilde_bin_dir=$5 299 299 get_shell_config__136_v0 "${shell_name}" "${install_env}" "${quoted_install_dir}" "${bin_env}" 300 - commands_34=("${ret_get_shell_config136_v0[@]}") 301 - refresh_command_35="" 300 + commands_31=("${ret_get_shell_config136_v0[@]}") 301 + refresh_command_32="" 302 302 env_var_get__106_v0 "HOME" 303 303 __status=$? 304 304 if [ "${__status}" != 0 ]; then 305 305 ret_configure_shell137_v0="" 306 306 return 0 307 307 fi 308 - home_36="${ret_env_var_get106_v0}" 308 + home_33="${ret_env_var_get106_v0}" 309 309 if [ "$([ "_${shell_name}" != "_fish" ]; echo $?)" != 0 ]; then 310 - fish_config_37="${home_36}/.config/fish/config.fish" 311 - tildify__134_v0 "${fish_config_37}" 312 - tilde_fish_config_38="${ret_tildify134_v0}" 313 - file_exists__40_v0 "${fish_config_37}" 310 + fish_config_34="${home_33}/.config/fish/config.fish" 311 + tildify__134_v0 "${fish_config_34}" 312 + tilde_fish_config_35="${ret_tildify134_v0}" 313 + file_exists__40_v0 "${fish_config_34}" 314 314 ret_file_exists40_v0__79_10="${ret_file_exists40_v0}" 315 315 if [ "${ret_file_exists40_v0__79_10}" != 0 ]; then 316 - content_39=" 316 + content_36=" 317 317 # ant 318 318 " 319 - for command_40 in "${commands_34[@]}"; do 320 - content_39+="${command_40} 319 + for command_37 in "${commands_31[@]}"; do 320 + content_36+="${command_37} 321 321 " 322 322 done 323 - file_append__43_v0 "${fish_config_37}" "${content_39}" 323 + file_append__43_v0 "${fish_config_34}" "${content_36}" 324 324 __status=$? 325 325 if [ "${__status}" != 0 ]; then 326 - echo "Manually add the directory to ${tilde_fish_config_38} (or similar):" 327 - for cmd_41 in "${commands_34[@]}"; do 328 - bold__117_v0 "${cmd_41}" 326 + echo "Manually add the directory to ${tilde_fish_config_35} (or similar):" 327 + for cmd_38 in "${commands_31[@]}"; do 328 + bold__117_v0 "${cmd_38}" 329 329 ret_bold117_v0__87_32="${ret_bold117_v0}" 330 330 echo -e " ${ret_bold117_v0__87_32}" 331 331 __status=$? ··· 333 333 ret_configure_shell137_v0="" 334 334 return 0 335 335 fi 336 - echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_fish_config_38}\"\x1b[0m" 336 + echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_fish_config_35}\"\x1b[0m" 337 337 __status=$? 338 - refresh_command_35="source ${tilde_fish_config_38}" 338 + refresh_command_32="source ${tilde_fish_config_35}" 339 339 else 340 - echo "Manually add the directory to ${tilde_fish_config_38} (or similar):" 341 - for cmd_42 in "${commands_34[@]}"; do 342 - bold__117_v0 "${cmd_42}" 340 + echo "Manually add the directory to ${tilde_fish_config_35} (or similar):" 341 + for cmd_39 in "${commands_31[@]}"; do 342 + bold__117_v0 "${cmd_39}" 343 343 ret_bold117_v0__96_30="${ret_bold117_v0}" 344 344 echo -e " ${ret_bold117_v0__96_30}" 345 345 __status=$? 346 346 done 347 347 fi 348 348 elif [ "$([ "_${shell_name}" != "_zsh" ]; echo $?)" != 0 ]; then 349 - zsh_config_43="${home_36}/.zshrc" 350 - tildify__134_v0 "${zsh_config_43}" 351 - tilde_zsh_config_44="${ret_tildify134_v0}" 352 - file_exists__40_v0 "${zsh_config_43}" 349 + zsh_config_40="${home_33}/.zshrc" 350 + tildify__134_v0 "${zsh_config_40}" 351 + tilde_zsh_config_41="${ret_tildify134_v0}" 352 + file_exists__40_v0 "${zsh_config_40}" 353 353 ret_file_exists40_v0__104_10="${ret_file_exists40_v0}" 354 354 if [ "${ret_file_exists40_v0__104_10}" != 0 ]; then 355 - content_45=" 355 + content_42=" 356 356 # ant 357 357 " 358 - for command_46 in "${commands_34[@]}"; do 359 - content_45+="${command_46} 358 + for command_43 in "${commands_31[@]}"; do 359 + content_42+="${command_43} 360 360 " 361 361 done 362 - file_append__43_v0 "${zsh_config_43}" "${content_45}" 362 + file_append__43_v0 "${zsh_config_40}" "${content_42}" 363 363 __status=$? 364 364 if [ "${__status}" != 0 ]; then 365 - echo "Manually add the directory to ${tilde_zsh_config_44} (or similar):" 366 - for cmd_47 in "${commands_34[@]}"; do 367 - bold__117_v0 "${cmd_47}" 365 + echo "Manually add the directory to ${tilde_zsh_config_41} (or similar):" 366 + for cmd_44 in "${commands_31[@]}"; do 367 + bold__117_v0 "${cmd_44}" 368 368 ret_bold117_v0__112_32="${ret_bold117_v0}" 369 369 echo -e " ${ret_bold117_v0__112_32}" 370 370 __status=$? ··· 372 372 ret_configure_shell137_v0="" 373 373 return 0 374 374 fi 375 - echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_zsh_config_44}\"\x1b[0m" 375 + echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_zsh_config_41}\"\x1b[0m" 376 376 __status=$? 377 - refresh_command_35="source ${tilde_zsh_config_44}" 377 + refresh_command_32="source ${tilde_zsh_config_41}" 378 378 else 379 - echo "Manually add the directory to ${tilde_zsh_config_44} (or similar):" 380 - for cmd_48 in "${commands_34[@]}"; do 381 - bold__117_v0 "${cmd_48}" 379 + echo "Manually add the directory to ${tilde_zsh_config_41} (or similar):" 380 + for cmd_45 in "${commands_31[@]}"; do 381 + bold__117_v0 "${cmd_45}" 382 382 ret_bold117_v0__121_30="${ret_bold117_v0}" 383 383 echo -e " ${ret_bold117_v0__121_30}" 384 384 __status=$? 385 385 done 386 386 fi 387 387 elif [ "$([ "_${shell_name}" != "_bash" ]; echo $?)" != 0 ]; then 388 - bash_configs_49=("${home_36}/.bash_profile" "${home_36}/.bashrc") 388 + bash_configs_46=("${home_33}/.bash_profile" "${home_33}/.bashrc") 389 389 env_var_get__106_v0 "XDG_CONFIG_HOME" 390 390 __status=$? 391 391 if [ "${__status}" != 0 ]; then 392 392 : 393 393 fi 394 - xdg_config_50="${ret_env_var_get106_v0}" 395 - if [ "$([ "_${xdg_config_50}" == "_" ]; echo $?)" != 0 ]; then 396 - bash_configs_49+=("${xdg_config_50}/.bash_profile" "${xdg_config_50}/.bashrc" "${xdg_config_50}/bash_profile" "${xdg_config_50}/bashrc") 394 + xdg_config_47="${ret_env_var_get106_v0}" 395 + if [ "$([ "_${xdg_config_47}" == "_" ]; echo $?)" != 0 ]; then 396 + bash_configs_46+=("${xdg_config_47}/.bash_profile" "${xdg_config_47}/.bashrc" "${xdg_config_47}/bash_profile" "${xdg_config_47}/bashrc") 397 397 fi 398 - set_manually_51=1 399 - for bash_config_52 in "${bash_configs_49[@]}"; do 400 - tildify__134_v0 "${bash_config_52}" 401 - tilde_bash_config_53="${ret_tildify134_v0}" 402 - file_exists__40_v0 "${bash_config_52}" 398 + set_manually_48=1 399 + for bash_config_49 in "${bash_configs_46[@]}"; do 400 + tildify__134_v0 "${bash_config_49}" 401 + tilde_bash_config_50="${ret_tildify134_v0}" 402 + file_exists__40_v0 "${bash_config_49}" 403 403 ret_file_exists40_v0__147_12="${ret_file_exists40_v0}" 404 404 if [ "${ret_file_exists40_v0__147_12}" != 0 ]; then 405 - content_54=" 405 + content_51=" 406 406 # ant 407 407 " 408 - for command_55 in "${commands_34[@]}"; do 409 - content_54+="${command_55} 408 + for command_52 in "${commands_31[@]}"; do 409 + content_51+="${command_52} 410 410 " 411 411 done 412 - file_append__43_v0 "${bash_config_52}" "${content_54}" 412 + file_append__43_v0 "${bash_config_49}" "${content_51}" 413 413 __status=$? 414 414 if [ "${__status}" != 0 ]; then 415 415 continue 416 416 fi 417 - echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_bash_config_53}\"\x1b[0m" 417 + echo -e "\x1b[2mAdded \"${tilde_bin_dir}\" to \$PATH in \"${tilde_bash_config_50}\"\x1b[0m" 418 418 __status=$? 419 - refresh_command_35="source ${tilde_bash_config_53}" 420 - set_manually_51=0 419 + refresh_command_32="source ${tilde_bash_config_50}" 420 + set_manually_48=0 421 421 break 422 422 fi 423 423 done 424 - if [ "${set_manually_51}" != 0 ]; then 424 + if [ "${set_manually_48}" != 0 ]; then 425 425 echo "Manually add the directory to ~/.bashrc (or similar):" 426 - for cmd_56 in "${commands_34[@]}"; do 427 - bold__117_v0 "${cmd_56}" 426 + for cmd_53 in "${commands_31[@]}"; do 427 + bold__117_v0 "${cmd_53}" 428 428 ret_bold117_v0__165_30="${ret_bold117_v0}" 429 429 echo -e " ${ret_bold117_v0__165_30}" 430 430 __status=$? ··· 441 441 echo -e " ${ret_bold117_v0__172_26}" 442 442 __status=$? 443 443 fi 444 - ret_configure_shell137_v0="${refresh_command_35}" 444 + ret_configure_shell137_v0="${refresh_command_32}" 445 445 return 0 446 446 } 447 447 ··· 457 457 echo_error__124_v0 "unzip is required to install ant" 1 458 458 fi 459 459 __length_18=("${args_3[@]}") 460 - if [ "$(( ${#__length_18[@]} > 3 ))" != 0 ]; then 461 - echo_error__124_v0 "Too many arguments. Usage: install.ab [tag] [--mbedtls]" 1 460 + if [ "$(( ${#__length_18[@]} > 2 ))" != 0 ]; then 461 + echo_error__124_v0 "Too many arguments. Usage: install.ab [tag]" 1 462 462 fi 463 463 get_target__135_v0 464 464 target_9="${ret_get_target135_v0}" 465 - env_var_get__106_v0 "MBEDTLS" 466 - __status=$? 467 - if [ "${__status}" != 0 ]; then 468 - : 469 - fi 470 - mbedtls_env_10="${ret_env_var_get106_v0}" 471 - use_mbedtls_11="$([ "_${mbedtls_env_10}" == "_" ]; echo $?)" 472 - for arg_12 in "${args_3[@]}"; do 473 - if [ "$([ "_${arg_12}" != "_--mbedtls" ]; echo $?)" != 0 ]; then 474 - use_mbedtls_11=1 475 - fi 476 - done 477 - if [ "${use_mbedtls_11}" != 0 ]; then 478 - starts_with__23_v0 "${target_9}" "darwin" 479 - ret_starts_with23_v0__202_8="${ret_starts_with23_v0}" 480 - if [ "${ret_starts_with23_v0__202_8}" != 0 ]; then 481 - target_9="${target_9}-mbedtls" 482 - else 483 - echo_error__124_v0 "--mbedtls option is only supported on macOS" 1 484 - fi 485 - fi 486 465 env_var_get__106_v0 "GITHUB" 487 466 __status=$? 488 467 if [ "${__status}" != 0 ]; then 489 468 : 490 469 fi 491 - github_13="${ret_env_var_get106_v0}" 492 - if [ "$([ "_${github_13}" != "_" ]; echo $?)" != 0 ]; then 493 - github_13="https://github.com" 470 + github_10="${ret_env_var_get106_v0}" 471 + if [ "$([ "_${github_10}" != "_" ]; echo $?)" != 0 ]; then 472 + github_10="https://github.com" 494 473 fi 495 - github_repo_14="${github_13}/themackabu/ant" 496 - ant_uri_15="" 497 - tag_16="" 498 - for arg_17 in "${args_3[@]}"; do 499 - if [ "$(( $([ "_${arg_17}" == "_--mbedtls" ]; echo $?) && $([ "_${arg_17}" == "_${args_3[0]}" ]; echo $?) ))" != 0 ]; then 500 - tag_16="${arg_17}" 474 + github_repo_11="${github_10}/themackabu/ant" 475 + ant_uri_12="" 476 + tag_13="" 477 + for arg_14 in "${args_3[@]}"; do 478 + if [ "$([ "_${arg_14}" == "_${args_3[0]}" ]; echo $?)" != 0 ]; then 479 + tag_13="${arg_14}" 501 480 fi 502 481 done 503 - if [ "$([ "_${tag_16}" != "_" ]; echo $?)" != 0 ]; then 504 - ant_uri_15="${github_repo_14}/releases/latest/download/ant-${target_9}.zip" 482 + if [ "$([ "_${tag_13}" != "_" ]; echo $?)" != 0 ]; then 483 + ant_uri_12="${github_repo_11}/releases/latest/download/ant-${target_9}.zip" 505 484 else 506 - ant_uri_15="${github_repo_14}/releases/download/${tag_16}/ant-${target_9}.zip" 485 + ant_uri_12="${github_repo_11}/releases/download/${tag_13}/ant-${target_9}.zip" 507 486 fi 508 - install_env_18="ANT_INSTALL" 509 - bin_env_19="\$${install_env_18}/bin" 487 + install_env_15="ANT_INSTALL" 488 + bin_env_16="\$${install_env_15}/bin" 510 489 env_var_get__106_v0 "HOME" 511 490 __status=$? 512 491 if [ "${__status}" != 0 ]; then 513 492 echo_error__124_v0 "HOME environment variable not set" 1 514 493 fi 515 - home_20="${ret_env_var_get106_v0}" 494 + home_17="${ret_env_var_get106_v0}" 516 495 env_var_get__106_v0 "ANT_INSTALL" 517 496 __status=$? 518 497 if [ "${__status}" != 0 ]; then 519 498 : 520 499 fi 521 - env_install_21="${ret_env_var_get106_v0}" 522 - install_dir_22="$(if [ "$([ "_${env_install_21}" == "_" ]; echo $?)" != 0 ]; then echo "${env_install_21}"; else echo "${home_20}/.ant"; fi)" 523 - bin_dir_23="${install_dir_22}/bin" 524 - exe_24="${bin_dir_23}/ant" 525 - dir_exists__39_v0 "${bin_dir_23}" 526 - ret_dir_exists39_v0__243_10="${ret_dir_exists39_v0}" 527 - if [ "$(( ! ${ret_dir_exists39_v0__243_10} ))" != 0 ]; then 528 - dir_create__45_v0 "${bin_dir_23}" 500 + env_install_18="${ret_env_var_get106_v0}" 501 + install_dir_19="$(if [ "$([ "_${env_install_18}" == "_" ]; echo $?)" != 0 ]; then echo "${env_install_18}"; else echo "${home_17}/.ant"; fi)" 502 + bin_dir_20="${install_dir_19}/bin" 503 + exe_21="${bin_dir_20}/ant" 504 + dir_exists__39_v0 "${bin_dir_20}" 505 + ret_dir_exists39_v0__228_10="${ret_dir_exists39_v0}" 506 + if [ "$(( ! ${ret_dir_exists39_v0__228_10} ))" != 0 ]; then 507 + dir_create__45_v0 "${bin_dir_20}" 529 508 __status=$? 530 509 if [ "${__status}" != 0 ]; then 531 - echo_error__124_v0 "Failed to create install directory \"${bin_dir_23}\"" 1 510 + echo_error__124_v0 "Failed to create install directory \"${bin_dir_20}\"" 1 532 511 fi 533 512 fi 534 - curl --fail --location --progress-bar --output "${exe_24}.zip" "${ant_uri_15}" 513 + curl --fail --location --progress-bar --output "${exe_21}.zip" "${ant_uri_12}" 535 514 __status=$? 536 515 if [ "${__status}" != 0 ]; then 537 - echo_error__124_v0 "Failed to download ant from \"${ant_uri_15}\"" 1 516 + echo_error__124_v0 "Failed to download ant from \"${ant_uri_12}\"" 1 538 517 fi 539 - unzip -oqd "${bin_dir_23}" "${exe_24}.zip" 518 + unzip -oqd "${bin_dir_20}" "${exe_21}.zip" 540 519 __status=$? 541 520 if [ "${__status}" != 0 ]; then 542 521 echo_error__124_v0 "Failed to extract ant" 1 543 522 fi 544 - file_chmod__48_v0 "${exe_24}" "755" 523 + file_chmod__48_v0 "${exe_21}" "755" 545 524 __status=$? 546 525 if [ "${__status}" != 0 ]; then 547 526 echo_error__124_v0 "Failed to set permissions on ant executable" 1 548 527 fi 549 - rm "${exe_24}.zip" 528 + rm "${exe_21}.zip" 550 529 __status=$? 551 530 if [ "${__status}" != 0 ]; then 552 531 echo_error__124_v0 "Failed to clean up zip file" 1 553 532 fi 554 - tildify__134_v0 "${exe_24}" 555 - ret_tildify134_v0__265_78="${ret_tildify134_v0}" 556 - array_19=("${ret_tildify134_v0__265_78}") 533 + tildify__134_v0 "${exe_21}" 534 + ret_tildify134_v0__250_78="${ret_tildify134_v0}" 535 + array_19=("${ret_tildify134_v0__250_78}") 557 536 printf__114_v0 "\\x1b[32mant was installed successfully to \\x1b[1;32m%s\\x1b[0m 558 537 " array_19[@] 559 538 is_command__108_v0 "ant" 560 - ret_is_command108_v0__267_6="${ret_is_command108_v0}" 561 - if [ "${ret_is_command108_v0__267_6}" != 0 ]; then 539 + ret_is_command108_v0__252_6="${ret_is_command108_v0}" 540 + if [ "${ret_is_command108_v0__252_6}" != 0 ]; then 562 541 echo "Run 'ant --help' to get started" 563 542 exit 0 564 543 __status=$? 565 544 fi 566 - tildify__134_v0 "${bin_dir_23}" 567 - tilde_bin_dir_30="${ret_tildify134_v0}" 568 - quoted_install_dir_31="\"${install_dir_22}\"" 569 - starts_with__23_v0 "${install_dir_22}" "${home_20}" 570 - ret_starts_with23_v0__275_6="${ret_starts_with23_v0}" 571 - if [ "${ret_starts_with23_v0__275_6}" != 0 ]; then 572 - replace__1_v0 "${quoted_install_dir_31}" "${home_20}" "\$HOME" 573 - quoted_install_dir_31="${ret_replace1_v0}" 545 + tildify__134_v0 "${bin_dir_20}" 546 + tilde_bin_dir_27="${ret_tildify134_v0}" 547 + quoted_install_dir_28="\"${install_dir_19}\"" 548 + starts_with__23_v0 "${install_dir_19}" "${home_17}" 549 + ret_starts_with23_v0__260_6="${ret_starts_with23_v0}" 550 + if [ "${ret_starts_with23_v0__260_6}" != 0 ]; then 551 + replace__1_v0 "${quoted_install_dir_28}" "${home_17}" "\$HOME" 552 + quoted_install_dir_28="${ret_replace1_v0}" 574 553 fi 575 554 echo "" 576 555 env_var_get__106_v0 "SHELL" ··· 578 557 if [ "${__status}" != 0 ]; then 579 558 : 580 559 fi 581 - shell_path_32="${ret_env_var_get106_v0}" 582 - command_20="$(basename "${shell_path_32}")" 560 + shell_path_29="${ret_env_var_get106_v0}" 561 + command_20="$(basename "${shell_path_29}")" 583 562 __status=$? 584 - shell_name_33="${command_20}" 585 - configure_shell__137_v0 "${shell_name_33}" "${install_env_18}" "${quoted_install_dir_31}" "${bin_env_19}" "${tilde_bin_dir_30}" 586 - refresh_command_57="${ret_configure_shell137_v0}" 563 + shell_name_30="${command_20}" 564 + configure_shell__137_v0 "${shell_name_30}" "${install_env_15}" "${quoted_install_dir_28}" "${bin_env_16}" "${tilde_bin_dir_27}" 565 + refresh_command_54="${ret_configure_shell137_v0}" 587 566 echo "" 588 567 echo -e "\x1b[2mTo get started, run:\x1b[0m" 589 568 __status=$? 590 - if [ "$([ "_${refresh_command_57}" == "_" ]; echo $?)" != 0 ]; then 591 - bold__117_v0 "${refresh_command_57}" 592 - ret_bold117_v0__291_24="${ret_bold117_v0}" 593 - echo -e " ${ret_bold117_v0__291_24}" 569 + if [ "$([ "_${refresh_command_54}" == "_" ]; echo $?)" != 0 ]; then 570 + bold__117_v0 "${refresh_command_54}" 571 + ret_bold117_v0__276_24="${ret_bold117_v0}" 572 + echo -e " ${ret_bold117_v0__276_24}" 594 573 __status=$? 595 574 fi 596 575 bold__117_v0 "ant --help" 597 - ret_bold117_v0__294_22="${ret_bold117_v0}" 598 - echo -e " ${ret_bold117_v0__294_22}" 576 + ret_bold117_v0__279_22="${ret_bold117_v0}" 577 + echo -e " ${ret_bold117_v0__279_22}" 599 578 __status=$?
-1
.github/versions.json
··· 6 6 }, 7 7 "dependencies": { 8 8 "libsodium": "1.0.20", 9 - "mbedtls": "3.6.5", 10 9 "zlib": "1.3.1" 11 10 }, 12 11 "targets": {
+1 -23
.github/workflows/build-platform.yml
··· 7 7 description: 'Platform key from versions.json targets' 8 8 required: true 9 9 type: string 10 - tls_library: 11 - description: 'TLS library (openssl or mbedtls)' 12 - required: false 13 - type: string 14 - default: 'openssl' 15 10 build_timestamp: 16 11 required: true 17 12 type: string ··· 98 93 for pkg in meson ninja llvm jq; do 99 94 brew list "$pkg" &>/dev/null || brew install "$pkg" 100 95 done 101 - if [[ "${{ inputs.tls_library }}" != "mbedtls" ]]; then 102 - brew list openssl@3 &>/dev/null || brew install openssl@3 103 - fi 96 + brew list openssl@3 &>/dev/null || brew install openssl@3 104 97 105 98 # === WINDOWS SETUP === 106 99 - name: Disable Windows Defender real-time monitoring ··· 153 146 echo "cmake_generator=$(echo $CONFIG | jq -r '.cmake_generator // empty')" >> $GITHUB_OUTPUT 154 147 echo "extra_meson_args=$(echo $CONFIG | jq -r '.extra_meson_args // empty')" >> $GITHUB_OUTPUT 155 148 156 - # TLS library from workflow input (overrides versions.json) 157 - TLS_LIBRARY="${{ inputs.tls_library }}" 158 - echo "tls_library=$TLS_LIBRARY" >> $GITHUB_OUTPUT 159 - 160 - # Artifact name: append -mbedtls suffix when using mbedtls 161 149 ARTIFACT_NAME=$(echo $CONFIG | jq -r '.artifact_name') 162 - if [[ "$TLS_LIBRARY" == "mbedtls" ]]; then 163 - ARTIFACT_NAME="${ARTIFACT_NAME}-mbedtls" 164 - fi 165 150 echo "artifact_name=$ARTIFACT_NAME" >> $GITHUB_OUTPUT 166 151 167 - # Deps: add mbedtls to deps list when using mbedtls 168 152 DEPS_LIST=$(echo $CONFIG | jq -r '.deps | join(" ")') 169 - if [[ "$TLS_LIBRARY" == "mbedtls" ]]; then 170 - DEPS_LIST="$DEPS_LIST mbedtls" 171 - fi 172 153 echo "deps=$DEPS_LIST" >> $GITHUB_OUTPUT 173 154 174 155 # Dep versions 175 156 echo "libsodium_version=$(echo $DEPS | jq -r '.libsodium')" >> $GITHUB_OUTPUT 176 - echo "mbedtls_version=$(echo $DEPS | jq -r '.mbedtls')" >> $GITHUB_OUTPUT 177 157 echo "zlib_version=$(echo $DEPS | jq -r '.zlib')" >> $GITHUB_OUTPUT 178 158 179 159 # === SETUP ZIG === ··· 213 193 ranlib: ${{ steps.llvm.outputs.ranlib }} 214 194 cmake_generator: ${{ steps.config.outputs.cmake_generator }} 215 195 libsodium_version: ${{ steps.config.outputs.libsodium_version }} 216 - mbedtls_version: ${{ steps.config.outputs.mbedtls_version }} 217 196 zlib_version: ${{ steps.config.outputs.zlib_version }} 218 197 219 198 # === BUILD PROJECT === ··· 229 208 strip: ${{ steps.llvm.outputs.strip }} 230 209 deps_prefix: ${{ github.workspace }}/.deps-cache 231 210 build_timestamp: ${{ inputs.build_timestamp }} 232 - tls_library: ${{ steps.config.outputs.tls_library }} 233 211 static_link: ${{ steps.config.outputs.static_link }} 234 212 extra_meson_args: ${{ steps.config.outputs.extra_meson_args }} 235 213 binary_name: ${{ steps.config.outputs.binary_name }}
-9
.github/workflows/build-single.yml
··· 15 15 - macos-x64 16 16 - macos-aarch64 17 17 - windows-x64 18 - tls_library: 19 - description: 'TLS library' 20 - required: false 21 - type: choice 22 - default: 'openssl' 23 - options: 24 - - openssl 25 - - mbedtls 26 18 27 19 jobs: 28 20 prepare: ··· 38 30 uses: ./.github/workflows/build-platform.yml 39 31 with: 40 32 platform: ${{ inputs.platform }} 41 - tls_library: ${{ inputs.tls_library }} 42 33 build_timestamp: ${{ needs.prepare.outputs.timestamp }}
+2 -21
.github/workflows/build.yml
··· 44 44 platform: ${{ matrix.platform }} 45 45 build_timestamp: ${{ needs.prepare.outputs.timestamp }} 46 46 47 - build-mbedtls: 48 - needs: prepare 49 - strategy: 50 - fail-fast: false 51 - matrix: 52 - platform: 53 - - linux-glibc-x64 54 - - linux-glibc-aarch64 55 - - linux-musl-x64 56 - - linux-musl-aarch64 57 - - macos-x64 58 - - macos-aarch64 59 - - windows-x64 60 - uses: ./.github/workflows/build-platform.yml 61 - with: 62 - platform: ${{ matrix.platform }} 63 - tls_library: mbedtls 64 - build_timestamp: ${{ needs.prepare.outputs.timestamp }} 65 - 66 47 summary: 67 48 name: Version 68 - needs: [build, build-mbedtls] 49 + needs: [build] 69 50 runs-on: ubuntu-latest 70 - if: ${{ !cancelled() && (needs.build.result != 'skipped' || needs.build-mbedtls.result != 'skipped') }} 51 + if: ${{ !cancelled() && needs.build.result != 'skipped' }} 71 52 steps: 72 53 - name: Download version artifacts 73 54 uses: actions/download-artifact@v4
+18 -40
BUILDING.md
··· 44 44 | GNU/Linux | aarch64 | glibc | No | Ubuntu 22.04 (CI) | 45 45 | GNU/Linux | x64 | musl | Yes | Alpine Edge (CI) | 46 46 | GNU/Linux | aarch64 | musl | Yes | Alpine Edge (CI) | 47 - | macOS | x64 | openssl | No | macOS 15 (CI) | 48 - | macOS | aarch64 | openssl | No | macOS 15 (CI) | 49 - | macOS | x64 | mbedtls | No | macOS 15 (CI) | 50 - | macOS | aarch64 | mbedtls | No | macOS 15 (CI) | 47 + | macOS | x64 | darwin | No | macOS 15 (CI) | 48 + | macOS | aarch64 | darwin | No | macOS 15 (CI) | 51 49 | Windows | x64 | mingw/msys | No | MSYS2 MINGW64 toolchain (CI) | 52 50 53 51 ### Supported toolchains ··· 65 63 66 64 CI binaries are produced using: 67 65 68 - | Binary package | Platform and Toolchain | 69 - | -------------------------- | -------------------------------------------- | 70 - | ant-linux-x64 | Ubuntu 22.04 (glibc), LLVM/Clang | 71 - | ant-linux-aarch64 | Ubuntu 22.04 (glibc), LLVM/Clang | 72 - | ant-linux-x64-musl | Alpine Edge (musl), statically linked, Clang | 73 - | ant-linux-aarch64-musl | Alpine Edge (musl), statically linked, Clang | 74 - | ant-darwin-x64 | macOS 15 Intel, LLVM/Clang | 75 - | ant-darwin-aarch64 | macOS 15 ARM, LLVM/Clang | 76 - | ant-darwin-x64-mbedtls | macOS 15 Intel, LLVM/Clang, mbedTLS | 77 - | ant-darwin-aarch64-mbedtls | macOS 15 ARM, LLVM/Clang, mbedTLS | 78 - | ant-windows-x64 | MSYS2 MINGW64 toolchain | 66 + | Binary package | Platform and Toolchain | 67 + | ---------------------- | -------------------------------------------- | 68 + | ant-linux-x64 | Ubuntu 22.04 (glibc), LLVM/Clang | 69 + | ant-linux-aarch64 | Ubuntu 22.04 (glibc), LLVM/Clang | 70 + | ant-linux-x64-musl | Alpine Edge (musl), statically linked, Clang | 71 + | ant-linux-aarch64-musl | Alpine Edge (musl), statically linked, Clang | 72 + | ant-darwin-x64 | macOS 15 Intel, LLVM/Clang | 73 + | ant-darwin-aarch64 | macOS 15 ARM, LLVM/Clang | 74 + | ant-windows-x64 | MSYS2 MINGW64 toolchain | 79 75 80 76 ## Building Ant on supported platforms 81 77 ··· 94 90 95 91 System libraries required: 96 92 97 - - **OpenSSL** (default) or **mbedTLS** (alternative TLS backend) 93 + - **OpenSSL** 98 94 - **libsodium** 99 95 - **libuuid** (Linux/macOS) 100 96 - **llhttp** (if not building from source via cmake) ··· 419 415 420 416 Configure options are set via `meson setup` or `meson configure`: 421 417 422 - | Option | Type | Default | Description | 423 - | ------------------- | ------- | --------- | ------------------------------------------ | 424 - | `static_link` | boolean | `false` | Statically link the final binary | 425 - | `build_timestamp` | string | (auto) | Build timestamp (defaults to current time) | 426 - | `tls_library` | combo | `openssl` | TLS backend: `openssl` or `mbedtls` | 427 - | `deps_prefix_cmake` | string | (empty) | Prefix path for cmake dependency lookup | 418 + | Option | Type | Default | Description | 419 + | ------------------- | ------- | ------- | ------------------------------------------ | 420 + | `static_link` | boolean | `false` | Statically link the final binary | 421 + | `build_timestamp` | string | (auto) | Build timestamp (defaults to current time) | 422 + | `deps_prefix_cmake` | string | (empty) | Prefix path for cmake dependency lookup | 428 423 429 424 Standard Meson built-in options used by Ant: 430 425 ··· 441 436 Example: 442 437 443 438 ```bash 444 - meson setup build -Dtls_library=mbedtls -Dstatic_link=true --prefer-static 445 - ``` 446 - 447 - ## TLS library selection 448 - 449 - Ant supports two TLS backends: 450 - 451 - - **OpenSSL** (default): Widely available, used on all platforms by default. 452 - - **mbedTLS**: Lighter alternative, useful for embedded or constrained 453 - environments. Currently only tested on macOS CI. 454 - 455 - To build with mbedTLS: 456 - 457 - ```bash 458 - meson setup build -Dtls_library=mbedtls 439 + meson setup build -Dstatic_link=true --prefer-static 459 440 ``` 460 - 461 - When using mbedTLS, the target triple in the version string will include 462 - `-mbedtls` as a suffix.
-3
README.md
··· 38 38 39 39 ```bash 40 40 curl -fsSL https://ant.themackabu.com/install | bash 41 - 42 - # or with MbedTLS 43 - curl -fsSL https://ant.themackabu.com/install | MBEDTLS=1 bash 44 41 ``` 45 42 46 43 ## Spec conformance
-1
libant/meson_options.txt
··· 1 1 option('jit', type: 'boolean', value: true, description: 'enable JIT compiler') 2 2 option('build_timestamp', type: 'string', value: '', description: 'build timestamp (defaults to current time if empty)') 3 - option('tls_library', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl', description: 'TLS library to use') 4 3 option('deps_prefix_cmake', type: 'string', value: '', description: 'prefix path for finding dependencies in cmake subprojects') 5 4 option('lto', type: 'boolean', value: true, description: 'also build LTO version (libant-lto.a)')
+1 -1
libant/scripts/compile.sh
··· 20 20 rm -rf "$tlsuv_prefix" 21 21 cp -RL "$BUILD_DIR/deps" "$tlsuv_prefix" 22 22 23 - meson setup build --prefer-static -Dtls_library=mbedtls -Ddeps_prefix_cmake="$tlsuv_prefix" "$@" 23 + meson setup build --prefer-static -Ddeps_prefix_cmake="$tlsuv_prefix" "$@" 24 24 meson compile -C build
-17
libant/scripts/deps.sh
··· 6 6 build_deps() { 7 7 if [ -f "$DEPS_DIR/lib/libllhttp.a" ] && \ 8 8 [ -f "$DEPS_DIR/lib/libz.a" ] && \ 9 - [ -f "$DEPS_DIR/lib/libmbedtls.a" ] && \ 10 9 [ -f "$DEPS_DIR/lib/libsodium.a" ]; then 11 10 echo "Dependencies already built, skipping..." 12 11 return ··· 41 40 cmake --build build -j$NCPU 42 41 cmake --install build 43 42 rm -f "$DEPS_DIR/lib/libz.so"* "$DEPS_DIR/lib/libz.dylib"* 2>/dev/null || true 44 - fi 45 - 46 - if [ ! -f "$DEPS_DIR/lib/libmbedtls.a" ]; then 47 - echo "Building mbedTLS..." 48 - rm -rf "$CACHE_DIR/mbedtls" 49 - git clone --depth 1 --branch mbedtls-3.6.5 --recurse-submodules https://github.com/Mbed-TLS/mbedtls.git "$CACHE_DIR/mbedtls" 50 - cd "$CACHE_DIR/mbedtls" 51 - cmake -B build \ 52 - -DCMAKE_INSTALL_PREFIX="$DEPS_DIR" \ 53 - -DENABLE_PROGRAMS=OFF \ 54 - -DENABLE_TESTING=OFF \ 55 - -DCMAKE_BUILD_TYPE=Release \ 56 - -DUSE_STATIC_MBEDTLS_LIBRARY=ON \ 57 - -DUSE_SHARED_MBEDTLS_LIBRARY=OFF 58 - cmake --build build -j$NCPU 59 - cmake --install build 60 43 fi 61 44 62 45 if [ ! -f "$DEPS_DIR/lib/libsodium.a" ]; then
+3 -15
meson/deps/meson.build
··· 1 1 cc = meson.get_compiler('c') 2 - tls_lib = get_option('tls_library') 3 2 4 - if tls_lib == 'openssl' 5 - openssl_dep = dependency('openssl', required: true, static: is_static) 6 - mbedtls_dep = [] 7 - else 8 - openssl_dep = dependency('', required: false) 9 - mbedtls_dep = [ 10 - dependency('mbedtls', required: true, static: is_static), 11 - dependency('mbedx509', required: true, static: is_static), 12 - dependency('mbedcrypto', required: true, static: is_static), 13 - ] 14 - endif 15 - 3 + openssl_dep = dependency('openssl', required: true, static: is_static) 16 4 libsodium_dep = dependency('libsodium', required: true, static: is_static) 17 5 18 6 if host_machine.system() == 'windows' ··· 89 77 cmake_prefix = get_option('deps_prefix_cmake') 90 78 91 79 tlsuv_sub = subproject('tlsuv', default_options: [ 92 - 'tls_backend=' + tls_lib, 80 + 'tls_backend=openssl', 93 81 'deps_prefix_cmake=' + cmake_prefix, 94 82 'warning_level=0', 95 83 ]) ··· 216 204 uriparser_dep, utf8proc_dep, openssl_dep, 217 205 zlib_dep, brotli_common_dep, brotli_dec_dep, 218 206 brotli_enc_dep, uthash_dep, lmdb_dep, wamr_dep, 219 - ] + mbedtls_dep + win_deps 207 + ] + win_deps 220 208 221 209 if get_option('jit') 222 210 mir_dep = subproject('mir').get_variable('mir_dep')
-1
meson/snapshot/meson.build
··· 18 18 'GIT_HASH=' + git_hash, 19 19 'BUILD_TIMESTAMP=' + timestamp, 20 20 'TARGET=' + target_triple, 21 - 'MBEDTLS=' + (tls_lib == 'mbedtls').to_string(), 22 21 'HOST=' + host_machine.system(), 23 22 ], 24 23 )
-2
meson/version/meson.build
··· 16 16 target_triple = triple_parts[0] + '-unknown-' + triple_parts[2] + '-' + triple_parts[3] 17 17 endif 18 18 19 - target_triple = target_triple + (tls_lib == 'mbedtls' ? '-mbedtls' : '') 20 - 21 19 add_project_arguments( 22 20 '-DANT_VERSION="' + ant_version + '"', 23 21 '-DANT_BUILD_TIMESTAMP=' + timestamp,
-1
meson_options.txt
··· 1 1 option('jit', type: 'boolean', value: true, description: 'enable JIT compiler') 2 2 option('static_link', type: 'boolean', value: false, description: 'statically link the binary') 3 - option('tls_library', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl', description: 'TLS library to use') 4 3 option('build_timestamp', type: 'string', value: '', description: 'build timestamp (defaults to current time if empty)') 5 4 option('deps_prefix_cmake', type: 'string', value: '', description: 'prefix path for finding dependencies in cmake subprojects')
+1 -1
src/core/features.ts
··· 1 1 process.features = { 2 2 uv: true, 3 - tls_mbedtls: import.meta.env.MBEDTLS as unknown as boolean, 3 + tls: 'openssl', 4 4 typescript: 'transform' 5 5 }; 6 6
+4 -1
src/types/process.d.ts
··· 7 7 8 8 interface Features { 9 9 uv: boolean; 10 - tls_mbedtls: boolean; 10 + tls: string; 11 11 typescript: 'transform' | 'none'; 12 12 } 13 13 14 14 interface Versions { 15 + node: string; 15 16 ant: string; 17 + v8: string; 16 18 uv: string; 19 + modules: string; 17 20 } 18 21 19 22 interface Release {
-24
vendor/packagefiles/patches/tlsuv-fix-fd-type.patch
··· 1 - --- a/src/mbedtls/engine.c 2 - +++ b/src/mbedtls/engine.c 3 - @@ -111,7 +111,7 @@ 4 - tlsuv_engine_t new_mbedtls_engine(tls_context *ctx, const char *host); 5 - 6 - static void mbedtls_set_io(tlsuv_engine_t, io_ctx , io_read , io_write ); 7 - -static void mbedtls_set_fd(tlsuv_engine_t, uv_os_fd_t ); 8 - +static void mbedtls_set_fd(tlsuv_engine_t, tlsuv_sock_t ); 9 - 10 - static tls_handshake_state mbedtls_hs_state(tlsuv_engine_t engine); 11 - static tls_handshake_state 12 - @@ -701,10 +701,10 @@ 13 - mbedtls_ssl_set_bio(eng->ssl, eng, engine_io_write, engine_io_read, NULL); 14 - } 15 - 16 - -static void mbedtls_set_fd(tlsuv_engine_t e, uv_os_fd_t fd) { 17 - +static void mbedtls_set_fd(tlsuv_engine_t e, tlsuv_sock_t fd) { 18 - struct mbedtls_engine *eng = (struct mbedtls_engine *) e; 19 - assert(eng->io == NULL); 20 - - eng->io_fd = fd; 21 - + eng->io_fd = (uv_os_fd_t)fd; 22 - eng->io = &eng->io_fd; 23 - mbedtls_ssl_set_bio(eng->ssl, eng->io, mbedtls_net_send, mbedtls_net_recv, NULL); 24 - }
+4 -16
vendor/packagefiles/tlsuv/meson.build
··· 47 47 tlsuv_sources += files('src/win32/win32_keychain.c') 48 48 endif 49 49 50 - if tls_backend == 'openssl' 51 - tlsuv_sources += files('src/openssl/engine.c', 'src/openssl/keys.c') 52 - elif tls_backend == 'mbedtls' 53 - tlsuv_sources += files('src/mbedtls/engine.c', 'src/mbedtls/keys.c') 54 - endif 50 + tlsuv_sources += files('src/openssl/engine.c', 'src/openssl/keys.c') 55 51 56 52 tlsuv_c_args = [ 57 53 '-DTLSUV_VERSION=v' + meson.project_version(), 58 54 '-DTLSUV_HTTP', 59 55 '-DTLS_IMPL=' + tls_backend, 56 + '-DUSE_OPENSSL', 60 57 '-w', 61 58 ] 62 59 63 - if tls_backend == 'openssl' 64 - tlsuv_c_args += '-DUSE_OPENSSL' 65 - elif tls_backend == 'mbedtls' 66 - tlsuv_c_args += '-DUSE_MBEDTLS' 67 - endif 68 - 69 60 if cmake_prefix != '' 70 61 tlsuv_c_args += ['-I' + cmake_prefix / 'include'] 71 62 endif ··· 78 69 tlsuv_c_args += ['-D_POSIX_C_SOURCE=200112', '-D_GNU_SOURCE'] 79 70 endif 80 71 81 - tls_dep = [] 82 - if tls_backend == 'openssl' 83 - tls_dep = dependency('openssl', required: true) 84 - tlsuv_c_args += ['-I' + tls_dep.get_variable(pkgconfig: 'includedir')] 85 - endif 72 + tls_dep = dependency('openssl', required: true) 73 + tlsuv_c_args += ['-I' + tls_dep.get_variable(pkgconfig: 'includedir')] 86 74 87 75 win_deps = [] 88 76 if host_machine.system() == 'windows'
+1 -1
vendor/packagefiles/tlsuv/meson_options.txt
··· 1 - option('tls_backend', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl', description: 'TLS backend library') 1 + option('tls_backend', type: 'combo', choices: ['openssl'], value: 'openssl', description: 'TLS backend library') 2 2 option('deps_prefix_cmake', type: 'string', value: '', description: 'Prefix for cmake-built dependencies')