diff options
author | Michael Stahl <mstahl@redhat.com> | 2017-05-30 17:26:59 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-05-30 20:19:22 +0200 |
commit | 48801417688bf69aaac00c4b448f7779db13e895 (patch) | |
tree | 18ae0e418c5639687c174959bf5bbe2f65e7f440 /external/python3 | |
parent | c102efd27a82eaaf94fe9fedb7be88cff80bceb2 (diff) |
python3: remove obsolete python-3.3.3-msvc2012-winxp.patch.1
...and python-3.3.0-msvc2012.patch etc.
They were actually never applied to Python 3.5.
Change-Id: I5beb5a81d55ab1921411d2351bdb397ff02ba75c
Diffstat (limited to 'external/python3')
-rw-r--r-- | external/python3/python-3.3.0-gcc-4.8.patch.1 | 16 | ||||
-rw-r--r-- | external/python3/python-3.3.0-msvc-x64.patch.1 | 289 | ||||
-rw-r--r-- | external/python3/python-3.3.0-msvc2012.patch.1 | 72 | ||||
-rw-r--r-- | external/python3/python-3.3.3-msvc2012-winxp.patch.1 | 117 | ||||
-rw-r--r-- | external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 | 12 |
5 files changed, 0 insertions, 506 deletions
diff --git a/external/python3/python-3.3.0-gcc-4.8.patch.1 b/external/python3/python-3.3.0-gcc-4.8.patch.1 deleted file mode 100644 index 6af06b338e96..000000000000 --- a/external/python3/python-3.3.0-gcc-4.8.patch.1 +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru python3.orig/Include/modsupport.h python3/Include/modsupport.h ---- python3.orig/Include/modsupport.h 2015-07-05 18:50:06.000000000 +0200 -+++ python3/Include/modsupport.h 2015-07-26 18:21:30.717680314 +0200 -@@ -26,7 +26,11 @@ - /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */ - #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 - PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); --PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...); -+PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) -+#ifdef PY_SSIZE_T_CLEAN -+ Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3) -+#endif -+ ; - PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, - const char *, char **, ...); - PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *); diff --git a/external/python3/python-3.3.0-msvc-x64.patch.1 b/external/python3/python-3.3.0-msvc-x64.patch.1 deleted file mode 100644 index a92acc77a563..000000000000 --- a/external/python3/python-3.3.0-msvc-x64.patch.1 +++ /dev/null @@ -1,289 +0,0 @@ -Fix Python build for x64 Windows - -diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln ---- python3/PCbuild/pcbuild.sln 2012-09-29 10:00:48.000000000 +0200 -+++ python3.new/PCbuild/pcbuild.sln 2012-11-12 22:13:49.445159668 +0100 -@@ -104,20 +84,20 @@ - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 -@@ -168,20 +148,20 @@ - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64 - {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 - {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 - {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 -@@ -577,38 +557,38 @@ - {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Debug|x64.Build.0 = Debug|x64 - {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 - {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 -- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.ActiveCfg = PGInstrument|Win32 -- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.Build.0 = PGInstrument|Win32 -+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 -+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.Build.0 = PGInstrument|x64 - {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 - {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 -- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.ActiveCfg = PGUpdate|Win32 -- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.Build.0 = PGUpdate|Win32 -+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 -+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.Build.0 = PGUpdate|x64 - {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|Win32.ActiveCfg = Release|Win32 - {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|Win32.Build.0 = Release|Win32 -- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.ActiveCfg = Release|Win32 -- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.Build.0 = Release|Win32 -+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.ActiveCfg = Release|x64 -+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.Build.0 = Release|x64 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|Win32.ActiveCfg = Debug|Win32 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|Win32.Build.0 = Debug|Win32 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|x64.ActiveCfg = Debug|x64 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|x64.Build.0 = Debug|x64 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 -- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.ActiveCfg = PGInstrument|Win32 -- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.Build.0 = PGInstrument|Win32 -+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 -+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.Build.0 = PGInstrument|x64 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 -- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.ActiveCfg = PGUpdate|Win32 -- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.Build.0 = PGUpdate|Win32 -+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 -+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.Build.0 = PGUpdate|x64 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|Win32.ActiveCfg = Release|Win32 - {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|Win32.Build.0 = Release|Win32 -- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.ActiveCfg = Release|Win32 -- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.Build.0 = Release|Win32 -+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.ActiveCfg = Release|x64 -+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.Build.0 = Release|x64 - {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Debug|Win32.ActiveCfg = Debug|Win32 - {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Debug|x64.ActiveCfg = Debug|x64 - {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|Win32.ActiveCfg = Release|Win32 -- {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|x64.ActiveCfg = Release|Win32 -+ {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|x64.ActiveCfg = Release|x64 - {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|Win32.ActiveCfg = Release|Win32 -- {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|x64.ActiveCfg = Release|Win32 -+ {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|x64.ActiveCfg = Release|x64 - {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|Win32.ActiveCfg = Release|Win32 - {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection ---- python3/PCbuild/make_buildinfo.vcxproj -+++ python3/PCbuild/make_buildinfo.vcxproj -@@ -5,6 +5,10 @@ - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> -+ <ProjectConfiguration Include="Release|x64"> -+ <Configuration>Release</Configuration> -+ <Platform>x64</Platform> -+ </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{C73F0EC1-358B-4177-940F-0846AC8B04CD}</ProjectGuid> -@@ -16,6 +20,10 @@ - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>NotSet</CharacterSet> - </PropertyGroup> -+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -+ <ConfigurationType>Application</ConfigurationType> -+ <CharacterSet>NotSet</CharacterSet> -+ </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> -@@ -24,17 +32,38 @@ - <Import Project="pyproject.props" /> - <Import Project="release.props" /> - </ImportGroup> -+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -+ <Import Project="pyproject.props" /> -+ <Import Project="x64.props" /> -+ <Import Project="release.props" /> -+ </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> - <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> - <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> - <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> -+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> -+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> -+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> -+ <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> -+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> -+ </ClCompile> -+ <Link> -+ <OutputFile>$(OutDir)make_buildinfo.exe</OutputFile> -+ <SubSystem>Console</SubSystem> -+ </Link> -+ </ItemDefinitionGroup> -+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -+ <ClCompile> -+ <Optimization>Disabled</Optimization> -+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> ---- python3/PCbuild/make_versioninfo.vcxproj -+++ python3/PCbuild/make_versioninfo.vcxproj -@@ -114,24 +114,25 @@ - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <CustomBuildStep> - <Message>Build PC/pythonnt_rc(_d).h</Message> - <Command>cd $(SolutionDir) --make_versioninfo.exe > ..\PC\pythonnt_rc.h -+amd64\make_versioninfo.exe > ..\PC\pythonnt_rc.h - </Command> - <Outputs>$(SolutionDir)..\PC\pythonnt_rc.h;%(Outputs)</Outputs> - </CustomBuildStep> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> -- <OutputFile>$(SolutionDir)make_versioninfo.exe</OutputFile> -+ <OutputFile>$(SolutionDir)amd64\make_versioninfo.exe</OutputFile> -+ <SubSystem>Console</SubSystem> - </Link> - <PostBuildEvent> - <Command>cd $(SolutionDir) --make_versioninfo.exe > ..\PC\python_nt.h -+amd64\make_versioninfo.exe > ..\PC\python_nt.h - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -@@ -172,9 +172,9 @@ - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <CustomBuildStep> - <Message>Build PC/pythonnt_rc(_d).h</Message> - <Command>cd $(SolutionDir) --make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h -+amd64\make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h - </Command> - <Outputs>$(SolutionDir)..\PC\pythonnt_rc_d.h;%(Outputs)</Outputs> - </CustomBuildStep> - <Midl> -@@ -186,14 +186,15 @@ - <IntrinsicFunctions>false</IntrinsicFunctions> - <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> -- <OutputFile>$(SolutionDir)make_versioninfo_d.exe</OutputFile> -+ <OutputFile>$(SolutionDir)amd64\make_versioninfo_d.exe</OutputFile> -+ <SubSystem>Console</SubSystem> - <TargetMachine>MachineX64</TargetMachine> - </Link> - <PostBuildEvent> - <Command>cd $(SolutionDir) --make_versioninfo_d.exe > ..\PC\python_nt_d.h -+amd64\make_versioninfo_d.exe > ..\PC\python_nt_d.h - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemGroup> ---- python3/PCbuild/pythoncore.vcxproj -+++ python3/PCbuild/pythoncore.vcxproj -@@ -195,35 +195,35 @@ - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Midl> - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <ClCompile> - <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - </ClCompile> - <ResourceCompile> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <Culture>0x0409</Culture> - <AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ResourceCompile> - <PreLinkEvent> - <Message>Generate build information...</Message> -- <Command>"$(SolutionDir)make_buildinfo.exe" Release "$(IntDir)"</Command> -+ <Command>"$(SolutionDir)amd64\make_buildinfo.exe" Release "$(IntDir)"</Command> - </PreLinkEvent> - <Link> - <AdditionalDependencies>$(IntDir)getbuildinfo.o;%(AdditionalDependencies)</AdditionalDependencies> - <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> - <BaseAddress>0x1e000000</BaseAddress> - </Link> - <PreBuildEvent> - <Command>$(KillPythonExe) - IF %ERRORLEVEL% NEQ 0 ( - echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL% - exit /b 0 - )</Command> - </PreBuildEvent> - <PreBuildEvent> - <Message>Killing any running $(PythonExe) instances...</Message> - </PreBuildEvent> - </ItemDefinitionGroup> -@@ -289,9 +289,9 @@ - <AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ResourceCompile> - <PreLinkEvent> - <Message>Generate build information...</Message> -- <Command>"$(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)"</Command> -+ <Command>"$(SolutionDir)amd64\make_buildinfo.exe" Debug "$(IntDir)"</Command> - </PreLinkEvent> - <Link> - <AdditionalDependencies>$(IntDir)getbuildinfo.o;%(AdditionalDependencies)</AdditionalDependencies> - <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> diff --git a/external/python3/python-3.3.0-msvc2012.patch.1 b/external/python3/python-3.3.0-msvc2012.patch.1 deleted file mode 100644 index 9bbfbfbaf0d6..000000000000 --- a/external/python3/python-3.3.0-msvc2012.patch.1 +++ /dev/null @@ -1,72 +0,0 @@ -Adapt VC10/MSVC2010 stuff for VC11/MSVC2012 (apparently builds with both then) - -diff -ru python3.old_/PCbuild/_msi.vcxproj python3/PCbuild/_msi.vcxproj ---- python3.old_/PCbuild/_msi.vcxproj 2012-09-29 10:00:48.000000000 +0200 -+++ python3/PCbuild/_msi.vcxproj 2012-11-13 15:52:40.656101165 +0100 -@@ -151,7 +151,7 @@ - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Link> -- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <BaseAddress>0x1D160000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -160,13 +160,13 @@ - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <Link> -- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <BaseAddress>0x1D160000</BaseAddress> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Link> -- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <BaseAddress>0x1D160000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -175,13 +175,13 @@ - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <Link> -- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <BaseAddress>0x1D160000</BaseAddress> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'"> - <Link> -- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <BaseAddress>0x1D160000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -190,14 +190,14 @@ - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <Link> -- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <BaseAddress>0x1D160000</BaseAddress> - <TargetMachine>MachineX64</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'"> - <Link> -- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <BaseAddress>0x1D160000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -206,7 +206,7 @@ - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <Link> -- <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> -+ <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <BaseAddress>0x1D160000</BaseAddress> - <TargetMachine>MachineX64</TargetMachine> - </Link> diff --git a/external/python3/python-3.3.3-msvc2012-winxp.patch.1 b/external/python3/python-3.3.3-msvc2012-winxp.patch.1 deleted file mode 100644 index 2addd4962c07..000000000000 --- a/external/python3/python-3.3.3-msvc2012-winxp.patch.1 +++ /dev/null @@ -1,117 +0,0 @@ -without explicit subsystem set, the linker tries to open a file -with the name of the comptibility version -(fatal error LNK1181: cannot open input file ",5.01") -diff -ur python3.org/PCbuild/_ctypes.vcxproj python3/PCbuild/_ctypes.vcxproj ---- python3.org/PCbuild/_ctypes.vcxproj 2014-05-19 19:06:01.274114800 +0200 -+++ python3/PCbuild/_ctypes.vcxproj 2014-05-19 19:07:13.649079800 +0200 -@@ -174,7 +174,7 @@ - </ClCompile> - <Link> - <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -187,7 +187,7 @@ - </ClCompile> - <Link> - <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -197,7 +197,7 @@ - </ClCompile> - <Link> - <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -210,7 +210,7 @@ - </ClCompile> - <Link> - <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - <TargetMachine>MachineX64</TargetMachine> - </Link> -@@ -221,7 +221,7 @@ - </ClCompile> - <Link> - <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -234,7 +234,7 @@ - </ClCompile> - <Link> - <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - <TargetMachine>MachineX64</TargetMachine> - </Link> -diff -ur python3.org/PCbuild/_decimal.vcxproj python3/PCbuild/_decimal.vcxproj ---- python3.org/PCbuild/_decimal.vcxproj 2014-05-19 19:06:01.274114800 +0200 -+++ python3/PCbuild/_decimal.vcxproj 2014-05-19 19:07:13.649079800 +0200 -@@ -176,7 +176,7 @@ - <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -189,7 +189,7 @@ - <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;..\Include;..\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -199,7 +199,7 @@ - <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -212,7 +212,7 @@ - <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - <TargetMachine>MachineX64</TargetMachine> - </Link> -@@ -223,7 +223,7 @@ - <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - </Link> - </ItemDefinitionGroup> -@@ -236,7 +236,7 @@ - <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> -- <SubSystem>NotSet</SubSystem> -+ <SubSystem>Console</SubSystem> - <BaseAddress>0x1D1A0000</BaseAddress> - <TargetMachine>MachineX64</TargetMachine> - </Link> diff --git a/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 b/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 deleted file mode 100644 index d955618674e5..000000000000 --- a/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur python3.org/Mac/PythonLauncher/Makefile.in python3/Mac/PythonLauncher/Makefile.in ---- python3.org/Mac/PythonLauncher/Makefile.in 2015-06-06 08:47:38.000000000 +0300 -+++ python3/Mac/PythonLauncher/Makefile.in 2015-06-06 08:48:18.000000000 +0300 -@@ -53,7 +53,7 @@ - --resource=$(srcdir)/factorySettings.plist \ - --plist Info.plist \ - build -- find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -r -+ find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -rf - - - FileSettings.o: $(srcdir)/FileSettings.m |