ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Python: upgrade to 3.11.11 (master only)

Browse Source 
Downloaded from https://www.python.org/ftp/python/3.11.11/Python-3.11.11.tar.xz

* Add external/python3/replace-powershell-with-wget.patch.1
to avoid

FindPythonForBuild:
 Invoke-WebRequest : The request was aborted: Could not create SSL/TLS secure
 channel.
 At line:1 char:1
 + Invoke-WebRequest https://aka.ms/nugetclidl -OutFile
 'C:\cygwin64\home\tdf\jenki ...
 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~~
     + CategoryInfo          : InvalidOperation: (System.Net.HttpWebRequest:Htt
    pWebRequest) [Invoke-WebRequest], WebException
     + FullyQualifiedErrorId : WebCmdletWebResponseException,Microsoft.PowerShe
    ll.Commands.InvokeWebRequestCommand

 'py' is not recognized as an internal or external command,
 operable program or batch file.

when downloading nuget.exe from https://aka.ms/nugetclidl
using powershell. By default powershell uses TLS 1.0 and the site security requires TLS 1.2,
so it fails with 'The request was aborted: Could not create SSL/TLS
secure channel.'

Kudos to Caolán for helping with a compiling issue.
See https://lists.freedesktop.org/archives/libreoffice/2024-December/092830.html

Change-Id: If66a88dd8f8c7774c49f8c33e9e40d2d5418e7c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178681
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2025-01-09 15:42:20 +01:00
parent b06e7814d2
commit 50524481b3
13 changed files with 83 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/python3/ExternalProject_python3.mk
Vendored
+6
View File
@@ -33,9 +33,15 @@ ifeq ($(OS),WNT)
# at least for MSVC 2008 it is necessary to clear MAKEFLAGS because
# nmake is invoked
#
# Since Python 3.11, _freeze_module.vcxproj needs python.exe to build
# deepfreeze.c. At the moment target _RebuildDeepFrozen is called, python.exe
# doesn't exist yet so it needs to be downloaded using nuget.
# Call find_python.bat first to have nuget.exe and python.exe ready before building
$(call gb_ExternalProject_get_state_target,python3,build) :
$(call gb_Trace_StartRange,python3,EXTERNAL)
$(call gb_ExternalProject_run,build,\
cmd /c $(gb_UnpackedTarball_workdir)/python3/PCbuild/find_python.bat -q && \
MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build $(gb_MSBUILD_CONFIG_AND_PLATFORM) \
/p:bz2Dir=$(gb_UnpackedTarball_workdir)/bzip2 \
/p:opensslIncludeDir=$(gb_UnpackedTarball_workdir)/openssl/include \