diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2020-06-12 01:23:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 22:23:26 -0700 |
| commit | e1783c68c43bc59f545551071a2775971497c871 (patch) | |
| tree | f6f4fc4e64b9e63d1717a398e11ee85702122e2c /ports/python3/0001-static-library.patch | |
| parent | ca52d429b63391cbf7eb228cad4c7567200bee41 (diff) | |
| download | vcpkg-e1783c68c43bc59f545551071a2775971497c871.tar.gz vcpkg-e1783c68c43bc59f545551071a2775971497c871.zip | |
[python3] Update to Python 3.8 (#11708)
* [python3] Update to Python 3.8.3.
[vtk] Update to Python 3.8 and fix improper Python3 artifact
specification.
* [python3] Fix static linking, broken in 121faf2.
* [hyperscan] Add missing build dependency (fixes CI on macOS).
Diffstat (limited to 'ports/python3/0001-static-library.patch')
| -rw-r--r-- | ports/python3/0001-static-library.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/ports/python3/0001-static-library.patch b/ports/python3/0001-static-library.patch new file mode 100644 index 000000000..46502130d --- /dev/null +++ b/ports/python3/0001-static-library.patch @@ -0,0 +1,46 @@ +diff --git a/PC/pyconfig.h b/PC/pyconfig.h +index b6b8d44586..35b329f307 100644 +--- a/PC/pyconfig.h ++++ b/PC/pyconfig.h +@@ -257,6 +257,7 @@ typedef int pid_t; + + /* For Windows the Python core is in a DLL by default. Test + Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ ++#define Py_NO_ENABLE_SHARED + #if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) + # define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ + # define MS_COREDLL /* deprecated old symbol */ +@@ -282,6 +283,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ + # endif /* _DEBUG */ + # endif /* _MSC_VER */ + # endif /* Py_BUILD_CORE */ ++#else ++ /* So MSVC users need not specify the .lib file in their own config */ ++# pragma comment(lib, "version.lib") ++# pragma comment(lib, "shlwapi.lib") ++# pragma comment(lib, "ws2_32.lib") + #endif /* MS_COREDLL */ + + #if defined(MS_WIN64) +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 0666b90f66..eb5ecffe71 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -73,7 +73,7 @@ + <Import Project="python.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Label="Configuration"> +- <ConfigurationType>DynamicLibrary</ConfigurationType> ++ <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> +@@ -102,7 +102,7 @@ + <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>$(PySourcePath)Python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories Condition="$(IncludeExternals)">$(zlibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> +- <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> |