From dfb3482946dd20b5ae409a8f6ef37af49f3abf59 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 6 Feb 2024 14:16:55 -0700 Subject: [PATCH] deps_builder/win: update perl to 5.38.0.1 5.22.1.3 was incompatible with the latest openssl update. --- build_files/build_environment/cmake/setup_msys2.cmake | 8 ++++---- build_files/build_environment/patches/ming64sh.cmd | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build_files/build_environment/cmake/setup_msys2.cmake b/build_files/build_environment/cmake/setup_msys2.cmake index 633b74b5f2f..d9f670c46f7 100644 --- a/build_files/build_environment/cmake/setup_msys2.cmake +++ b/build_files/build_environment/cmake/setup_msys2.cmake @@ -111,9 +111,9 @@ endif() message("Checking for perl") # download perl for libvpx -if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip") +if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.38.0.1-64bit-portable.zip") message("Downloading perl") - file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip") + file(DOWNLOAD "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.38.0.1-64bit-portable.zip") endif() # make perl root directory @@ -125,10 +125,10 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/perl") endif() # extract perl -if((NOT EXISTS "${DOWNLOAD_DIR}/perl/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")) +if((NOT EXISTS "${DOWNLOAD_DIR}/perl/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.38.0.1-64bit-portable.zip")) message("Extracting perl") execute_process( - COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip + COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.38.0.1-64bit-portable.zip WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl ) endif() diff --git a/build_files/build_environment/patches/ming64sh.cmd b/build_files/build_environment/patches/ming64sh.cmd index aa25545bf95..1c5cc28ad65 100644 --- a/build_files/build_environment/patches/ming64sh.cmd +++ b/build_files/build_environment/patches/ming64sh.cmd @@ -2,6 +2,6 @@ @echo Setting up environment for MSYS2 MSVC 64-bit... -@set PATH=%CD%\usr\bin;%cd%\..\..\perl\site\bin;%cd%\..\..\perl\bin;%cd%\..\..\c\bin;%PATH% +@set PATH=%CD%\usr\bin;%cd%\..\..\perl\site\bin;%cd%\..\..\perl\perl\bin;%cd%\..\..\c\bin;%PATH%