From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 13 Mar 2006 15:37:40 +0000 (+0000)
Subject: Fix build process of bsddb for IA64 and AMD64.
X-Git-Tag: v2.5a0~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b091241d9bdf06caf66b807327c3dfa698721959;p=thirdparty%2FPython%2Fcpython.git

Fix build process of bsddb for IA64 and AMD64.
Remove remarks on size_t problems.
---

diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj
index a118b02f6836..daaa789e07b1 100644
--- a/PCbuild/_bsddb.vcproj
+++ b/PCbuild/_bsddb.vcproj
@@ -151,7 +151,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
+				AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_IA64\libdb44s.lib"
 				OutputFile="./_bsddb.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
+				AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib"
 				OutputFile="./_bsddb.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index db27ab94925e..bcd687f9c362 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -212,6 +212,15 @@ _bsddb
     XXX doesn't cause a test to fail when it happens (exceptions in
     XXX threads are invisible to unittest).
 
+    Building for Win64:
+    - open a VS.NET 2003 command prompt
+    - run the SDK setenv.cmd script, passing /RETAIL and the target
+      architecture (/SRV64 for Itanium, /X64 for AMD64)
+    - build BerkeleyDB with the solution configuration matching the
+      target ("Release IA64" for Itanium, "Release AMD64" for AMD64), e.g.
+    devenv db-4.4.20\build_win32\Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
+    
+
 _ssl
     Python wrapper for the secure sockets library.
 
@@ -262,10 +271,6 @@ from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to
 locate the proper target compiler, and convert compiler options
 accordingly.
 
-The Itanium build has seen little testing. The SDK compiler reports a lot
-of warnings about conversion from size_t to int, which will be fixed in
-future Python releases.
-
 Building for AMD64
 ------------------