• Michael Stahl's avatar
    python3: add module for internal Python 3 build (not active yet) · 8a6c5b2f
    Michael Stahl yazdı
    The module builds here on Fedora 17 and with MSVC2008.
    MacOS X is unfinished and probably breaks, which is why the module
    is disabled now.
    
    These patches from module python were dropped:
    
    Integrated upstream:
    - Python.mipsel-py4305.patch
    - Python-2.6.1-py4768.patch
    - Python-2.6.1-py2422.patch (modified, use --with-valgrind)
    - Python-2.6.1-urllib.patch
    - Python-2.6.1-py8067.patch
    
    Obsolete:
    - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now)
    - Python-parallel-make.patch
    - Python-2.6.1-nohardlink.patch (no idea why that would be needed,
                                     NFS should support hard links)
    - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch)
    - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal)
    - Python-2.6.2-bdb48.patch
    - Python-2.6.1-vc10.patch (upstream supports vc10)
    
    An attempt to cross compile with mingw that proved unsucessful according
    to dtardon; there is upstream work on this topic that is possibly
    already in 3.3: http://bugs.python.org/issue8067
    - Python-2.6.2-cross.patch
    - Python-2.6.2-cross.fix-configure.patch
    
    Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
    8a6c5b2f
python-3.3.0-msvc2012.patch.1 3.55 KB
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>