From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 25 Aug 2005 07:11:31 +0000 (+0000)
Subject: Patch #1160164: Use ReleaseItanium for zlib build.
X-Git-Tag: v2.5a0~1457
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fa5575fa4d06c3ae3909f5a8b4f29274767e33d;p=thirdparty%2FPython%2Fcpython.git

Patch #1160164: Use ReleaseItanium for zlib build.
Will backport to 2.4.
---

diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index c09256fd9350..37f26212f1f2 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -179,8 +179,8 @@ Global
 		{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.Build.0 = Debug|Win32
 		{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.ActiveCfg = Release|Win32
 		{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32
-		{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = Release|Win32
-		{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = Release|Win32
+		{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
+		{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
 	EndGlobalSection
 	GlobalSection(SolutionItems) = postSolution
 		readme.txt = readme.txt
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 9aa28f27cf9d..d9591bd83ce0 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -135,6 +135,9 @@ zlib
     However, the zlib project is not smart enough to remove anything under
     zlib-1.2.3\ when you do a clean, so if you want to rebuild zlib.lib
     you need to clean up zlib-1.2.3\ by hand.
+    When building zlib.pyd for Itanium, the pre-link build step won't work,
+    so you will need to invoke nmake manually, using an IA64 build 
+    environment.
 
 bz2
     Python wrapper for the libbz2 compression library.  Homepage