diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-08-22 17:37:44 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:08 +0200 |
| commit | b0a6bf81d8a555ff9870ec921be9353a36b493b2 (patch) | |
| tree | f6ddc4a4338d5b28cee8f5f42cb591d03e4212b2 /python | |
| parent | 4967505ad54de0639fbd7bfa553c57ead9ada6ec (diff) | |
fix python build with VC2012
Change-Id: Ibaec87c929889f0038b44aac1e07e2552adc5cc5
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-vc12.patch | 69 | ||||
| -rw-r--r-- | python/makefile.mk | 5 |
2 files changed, 73 insertions, 1 deletions
diff --git a/python/Python-2.6.1-vc12.patch b/python/Python-2.6.1-vc12.patch new file mode 100644 index 000000000000..3f8383c58705 --- /dev/null +++ b/python/Python-2.6.1-vc12.patch @@ -0,0 +1,69 @@ +--- misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj.orig 2012-08-22 17:28:56.856166700 -0400 ++++ misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj 2012-08-22 17:29:12.226731500 -0400 +@@ -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/python/makefile.mk b/python/makefile.mk index 9311c753f4ee..9ea78ef1e16a 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -162,6 +162,7 @@ BUILD_ACTION=$(ENV_BUILD) make && make install .IF "$(CCNUMVER)" >= "001600000000" PATCH_FILES+=Python-$(PYVERSION)-vc10.patch +PATCH_FILES+=Python-$(PYVERSION)-vc12.patch BUILD_DIR=PC/VS10.0 .ELIF "$(CCNUMVER)" >= "001500000000" BUILD_DIR=PCbuild @@ -188,7 +189,9 @@ CONF=Release # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native -.IF "$(CCNUMVER)" >= "001600000000" +.IF "$(CCNUMVER)" >= "001700000000" +BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=$(CONF) /p:PlatformToolset=v110 +.ELIF "$(CCNUMVER)" >= "001600000000" BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=$(CONF) /ToolsVersion:4.0 .ELSE BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "$(CONF)|$(ARCH)" |