incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1366182 [3/3] - in /incubator/ooo/trunk: ext_sources/ main/ main/python/ main/python/prj/ main/pyuno/zipcore/
Date Thu, 26 Jul 2012 20:20:35 GMT
Added: incubator/ooo/trunk/main/python/python-2.7.3-nohardlink.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-2.7.3-nohardlink.patch?rev=1366182&view=auto
==============================================================================
--- incubator/ooo/trunk/main/python/python-2.7.3-nohardlink.patch (added)
+++ incubator/ooo/trunk/main/python/python-2.7.3-nohardlink.patch Thu Jul 26 20:20:33 2012
@@ -0,0 +1,11 @@
+--- misc/Python-2.7.3/Makefile.pre.in	2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.3/Makefile.pre.in	2012-07-22 14:54:26.000000000 -0500
+@@ -427,7 +427,7 @@
+ libpython$(VERSION).so: $(LIBRARY_OBJS)
+ 	if test $(INSTSONAME) != $(LDLIBRARY); then \
+ 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+-		$(LN) -f $(INSTSONAME) $@; \
++		$(LN) -fs $(INSTSONAME) $@; \
+ 	else \
+ 		$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 	fi

Added: incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch?rev=1366182&view=auto
==============================================================================
--- incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch (added)
+++ incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch Thu Jul 26 20:20:33 2012
@@ -0,0 +1,1671 @@
+diff -u misc/Python-2.7.3/PCbuild/_bsddb.vcproj misc/build/Python-2.7.3/PCbuild/_bsddb.vcproj
+--- misc/Python-2.7.3/PCbuild/_bsddb.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_bsddb.vcproj	2012-07-25 18:42:53.000000000 -0500
+@@ -56,6 +56,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -120,6 +121,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -183,6 +185,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -248,6 +251,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -311,6 +315,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -375,6 +380,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 				TargetMachine="17"
+@@ -439,6 +445,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 			/>
+@@ -503,6 +510,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				AdditionalDependencies="$(bsddbDepLibs)"
+ 				BaseAddress="0x1e180000"
+ 				TargetMachine="17"
+diff -u misc/Python-2.7.3/PCbuild/_ctypes.vcproj misc/build/Python-2.7.3/PCbuild/_ctypes.vcproj
+--- misc/Python-2.7.3/PCbuild/_ctypes.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_ctypes.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -177,7 +177,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 			/>
+@@ -241,7 +241,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 			/>
+@@ -304,7 +304,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 			/>
+@@ -368,7 +368,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 				TargetMachine="17"
+@@ -432,7 +432,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 			/>
+@@ -496,7 +496,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++				AdditionalOptions="/SAFESEH /DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+ 				SubSystem="0"
+ 				BaseAddress="0x1D1A0000"
+ 				TargetMachine="17"
+diff -u misc/Python-2.7.3/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.3/PCbuild/_ctypes_test.vcproj
+--- misc/Python-2.7.3/PCbuild/_ctypes_test.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_ctypes_test.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -54,6 +54,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -113,6 +114,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -172,6 +174,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -232,6 +235,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -291,6 +295,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -352,6 +357,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -411,6 +417,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -472,6 +479,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/_elementtree.vcproj misc/build/Python-2.7.3/PCbuild/_elementtree.vcproj
+--- misc/Python-2.7.3/PCbuild/_elementtree.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_elementtree.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -57,6 +57,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D100000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/_hashlib.vcproj misc/build/Python-2.7.3/PCbuild/_hashlib.vcproj
+--- misc/Python-2.7.3/PCbuild/_hashlib.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_hashlib.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -58,6 +58,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -121,6 +122,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -184,6 +186,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -248,6 +251,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -311,6 +315,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -376,6 +381,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -439,6 +445,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -504,6 +511,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/_msi.vcproj misc/build/Python-2.7.3/PCbuild/_msi.vcproj
+--- misc/Python-2.7.3/PCbuild/_msi.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_msi.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -56,6 +56,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -364,6 +369,7 @@
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -425,6 +431,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,6 +495,7 @@
+ 				AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ 				BaseAddress="0x1D160000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.3/PCbuild/_multiprocessing.vcproj
+--- misc/Python-2.7.3/PCbuild/_multiprocessing.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_multiprocessing.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -56,6 +56,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -364,6 +369,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -425,6 +431,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,6 +495,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/_socket.vcproj misc/build/Python-2.7.3/PCbuild/_socket.vcproj
+--- misc/Python-2.7.3/PCbuild/_socket.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_socket.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -56,6 +56,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -364,6 +369,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -425,6 +431,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,6 +495,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				BaseAddress="0x1e1D0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.3/PCbuild/_sqlite3.vcproj
+--- misc/Python-2.7.3/PCbuild/_sqlite3.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_sqlite3.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -57,6 +57,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e180000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/_ssl.vcproj misc/build/Python-2.7.3/PCbuild/_ssl.vcproj
+--- misc/Python-2.7.3/PCbuild/_ssl.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_ssl.vcproj	2012-07-25 18:51:06.000000000 -0500
+@@ -43,7 +43,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -57,7 +57,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -106,7 +107,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -120,7 +121,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -169,7 +171,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -183,7 +185,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -233,7 +236,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -247,7 +250,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -296,7 +300,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -310,7 +314,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -360,7 +365,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -374,7 +379,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 				TargetMachine="17"
+ 			/>
+ 			<Tool
+@@ -424,7 +430,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -438,7 +444,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,7 +495,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCCLCompilerTool"
+-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
++				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
+ 			/>
+ 			<Tool
+ 				Name="VCManagedResourceCompilerTool"
+@@ -502,7 +509,8 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
+ 				TargetMachine="17"
+ 			/>
+ 			<Tool
+diff -u misc/Python-2.7.3/PCbuild/_testcapi.vcproj misc/build/Python-2.7.3/PCbuild/_testcapi.vcproj
+--- misc/Python-2.7.3/PCbuild/_testcapi.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_testcapi.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -55,6 +55,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -115,6 +116,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -175,6 +177,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -236,6 +239,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -296,6 +300,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -358,6 +363,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -418,6 +424,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -480,6 +487,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1e1F0000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/_tkinter.vcproj misc/build/Python-2.7.3/PCbuild/_tkinter.vcproj
+--- misc/Python-2.7.3/PCbuild/_tkinter.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/_tkinter.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -57,6 +57,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltkLibDebug)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltk64LibDebug)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltkLib)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltk64Lib)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltkLib)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltk64Lib)"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltkLib)"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="$(tcltk64Lib)"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.3/PCbuild/bdist_wininst.vcproj
+--- misc/Python-2.7.3/PCbuild/bdist_wininst.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/bdist_wininst.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -81,8 +81,7 @@
+ 				IgnoreDefaultLibraryNames="LIBC"
+ 				ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
+ 				SubSystem="2"
+-				RandomizedBaseAddress="1"
+-				DataExecutionPrevention="0"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				TargetMachine="1"
+ 			/>
+ 			<Tool
+@@ -171,8 +170,7 @@
+ 				IgnoreDefaultLibraryNames="LIBC"
+ 				ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0-amd64.pdb"
+ 				SubSystem="2"
+-				RandomizedBaseAddress="1"
+-				DataExecutionPrevention="0"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 				TargetMachine="17"
+ 			/>
+ 			<Tool
+diff -u misc/Python-2.7.3/PCbuild/bz2.vcproj misc/build/Python-2.7.3/PCbuild/bz2.vcproj
+--- misc/Python-2.7.3/PCbuild/bz2.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/bz2.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -57,6 +57,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D170000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/kill_python.vcproj misc/build/Python-2.7.3/PCbuild/kill_python.vcproj
+--- misc/Python-2.7.3/PCbuild/kill_python.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/kill_python.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -56,6 +56,7 @@
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName)_d.exe"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName)_d.exe"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -177,6 +179,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -238,6 +241,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.3/PCbuild/make_buildinfo.vcproj
+--- misc/Python-2.7.3/PCbuild/make_buildinfo.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/make_buildinfo.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -61,6 +61,7 @@
+ 				OutputFile="$(OutDir)/make_buildinfo.exe"
+ 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.3/PCbuild/make_versioninfo.vcproj
+--- misc/Python-2.7.3/PCbuild/make_versioninfo.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/make_versioninfo.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -71,6 +71,7 @@
+ 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ 				SubSystem="1"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -137,6 +138,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(SolutionDir)make_versioninfo.exe"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -214,6 +216,7 @@
+ 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ 				SubSystem="1"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -282,6 +285,7 @@
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/pyexpat.vcproj misc/build/Python-2.7.3/PCbuild/pyexpat.vcproj
+--- misc/Python-2.7.3/PCbuild/pyexpat.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/pyexpat.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -56,6 +56,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -364,6 +369,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -425,6 +431,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -488,6 +495,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/python.vcproj misc/build/Python-2.7.3/PCbuild/python.vcproj
+--- misc/Python-2.7.3/PCbuild/python.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/python.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -66,6 +66,7 @@
+ 				SubSystem="1"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -139,6 +140,7 @@
+ 				SubSystem="1"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -213,6 +215,7 @@
+ 				SubSystem="1"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -288,6 +291,7 @@
+ 				SubSystem="1"
+ 				StackReserveSize="2100000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -361,6 +365,7 @@
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -436,6 +441,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -509,6 +515,7 @@
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -584,6 +591,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/pythoncore.vcproj misc/build/Python-2.7.3/PCbuild/pythoncore.vcproj
+--- misc/Python-2.7.3/PCbuild/pythoncore.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/pythoncore.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -69,6 +69,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDir)$(PyDllName).lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -144,6 +145,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDir)$(PyDllName).lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -222,6 +224,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -300,6 +303,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -374,6 +378,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -450,6 +455,7 @@
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -524,6 +530,7 @@
+ 				ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -600,6 +607,7 @@
+ 				BaseAddress="0x1e000000"
+ 				ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -1874,4 +1882,4 @@
+ 	</Files>
+ 	<Globals>
+ 	</Globals>
+-</VisualStudioProject>
+\ No newline at end of file
++</VisualStudioProject>
+diff -u misc/Python-2.7.3/PCbuild/pythonw.vcproj misc/build/Python-2.7.3/PCbuild/pythonw.vcproj
+--- misc/Python-2.7.3/PCbuild/pythonw.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/pythonw.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -66,6 +66,7 @@
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
+ 				TargetMachine="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -137,6 +138,7 @@
+ 				OutputFile="$(OutDir)\pythonw_d.exe"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -208,6 +210,7 @@
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
+ 				TargetMachine="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -279,6 +282,7 @@
+ 				OutputFile="$(OutDir)\pythonw.exe"
+ 				StackReserveSize="2000000"
+ 				BaseAddress="0x1d000000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -351,6 +355,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -424,6 +429,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +502,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -569,6 +576,7 @@
+ 				BaseAddress="0x1d000000"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/select.vcproj misc/build/Python-2.7.3/PCbuild/select.vcproj
+--- misc/Python-2.7.3/PCbuild/select.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/select.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -57,6 +57,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -119,6 +120,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -181,6 +183,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -244,6 +247,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -306,6 +310,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -370,6 +375,7 @@
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -432,6 +438,7 @@
+ 				AdditionalDependencies="ws2_32.lib"
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -496,6 +503,7 @@
+ 				IgnoreDefaultLibraryNames="libc"
+ 				BaseAddress="0x1D110000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/sqlite3.vcproj misc/build/Python-2.7.3/PCbuild/sqlite3.vcproj
+--- misc/Python-2.7.3/PCbuild/sqlite3.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/sqlite3.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -56,6 +56,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -117,6 +118,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -178,6 +180,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -240,6 +243,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -301,6 +305,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -362,6 +367,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -423,6 +429,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				OutputFile="$(OutDir)\$(ProjectName).dll"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -484,6 +491,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/unicodedata.vcproj misc/build/Python-2.7.3/PCbuild/unicodedata.vcproj
+--- misc/Python-2.7.3/PCbuild/unicodedata.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/unicodedata.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -55,6 +55,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -115,6 +116,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -175,6 +177,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -236,6 +239,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -296,6 +300,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -358,6 +363,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -418,6 +424,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -480,6 +487,7 @@
+ 				Name="VCLinkerTool"
+ 				BaseAddress="0x1D120000"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.3/PCbuild/w9xpopen.vcproj
+--- misc/Python-2.7.3/PCbuild/w9xpopen.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/w9xpopen.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -59,6 +59,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -124,6 +125,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -191,6 +193,7 @@
+ 				Name="VCLinkerTool"
+ 				GenerateDebugInformation="false"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -259,6 +262,7 @@
+ 				Name="VCLinkerTool"
+ 				GenerateDebugInformation="false"
+ 				SubSystem="1"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -327,6 +331,7 @@
+ 				GenerateDebugInformation="false"
+ 				SubSystem="1"
+ 				ImportLibrary=""
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -397,6 +402,7 @@
+ 				SubSystem="1"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -465,6 +471,7 @@
+ 				GenerateDebugInformation="false"
+ 				SubSystem="1"
+ 				ImportLibrary=""
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -535,6 +542,7 @@
+ 				SubSystem="1"
+ 				ImportLibrary=""
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+diff -u misc/Python-2.7.3/PCbuild/winsound.vcproj misc/build/Python-2.7.3/PCbuild/winsound.vcproj
+--- misc/Python-2.7.3/PCbuild/winsound.vcproj	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/winsound.vcproj	2012-07-25 18:42:54.000000000 -0500
+@@ -55,6 +55,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -115,6 +116,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -175,6 +177,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -236,6 +239,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -296,6 +300,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -358,6 +363,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -418,6 +424,7 @@
+ 			<Tool
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"
+@@ -480,6 +487,7 @@
+ 				Name="VCLinkerTool"
+ 				AdditionalDependencies="winmm.lib"
+ 				TargetMachine="17"
++				AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+ 			/>
+ 			<Tool
+ 				Name="VCALinkTool"

Added: incubator/ooo/trunk/main/python/python-2.7.3-sysbase.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-2.7.3-sysbase.patch?rev=1366182&view=auto
==============================================================================
--- incubator/ooo/trunk/main/python/python-2.7.3-sysbase.patch (added)
+++ incubator/ooo/trunk/main/python/python-2.7.3-sysbase.patch Thu Jul 26 20:20:33 2012
@@ -0,0 +1,13 @@
+--- misc/Python-2.7.3/configure	2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.3/configure	2012-07-22 15:01:20.000000000 -0500
+@@ -2982,7 +2982,9 @@
+ if test -z "$MACHDEP"
+ then
+ 	ac_sys_system=`uname -s`
+-	if test "$ac_sys_system" = "AIX" \
++	if test -n "$OOO_SYSBASE_SYS_RELEASE"; then
++		ac_sys_release=$OOO_SYSBASE_SYS_RELEASE
++	elif test "$ac_sys_system" = "AIX" \
+ 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
+ 		ac_sys_release=`uname -v`
+ 	else

Added: incubator/ooo/trunk/main/python/python-2.7.3.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-2.7.3.patch?rev=1366182&view=auto
==============================================================================
--- incubator/ooo/trunk/main/python/python-2.7.3.patch (added)
+++ incubator/ooo/trunk/main/python/python-2.7.3.patch Thu Jul 26 20:20:33 2012
@@ -0,0 +1,105 @@
+diff -ru misc/Python-2.7.3/Include/pyport.h misc/build/Python-2.7.3/Include/pyport.h
+--- misc/Python-2.7.3/Include/pyport.h	2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.3/Include/pyport.h	2012-07-24 18:19:52.000000000 -0500
+@@ -603,11 +603,6 @@
+ in platform-specific #ifdefs.
+ **************************************************************************/
+ 
+-#ifdef SOLARIS
+-/* Unchecked */
+-extern int gethostname(char *, int);
+-#endif
+-
+ #ifdef __BEOS__
+ /* Unchecked */
+ /* It's in the libs, but not the headers... - [cjh] */
+Only in misc/build/Python-2.7.3/Include: pyport.h.orig
+diff -ru misc/Python-2.7.3/PCbuild/pcbuild.sln misc/build/Python-2.7.3/PCbuild/pcbuild.sln
+--- misc/Python-2.7.3/PCbuild/pcbuild.sln	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/pcbuild.sln	2012-07-24 22:31:19.000000000 -0500
+@@ -38,17 +38,17 @@
+ 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ 	EndProjectSection
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+@@ -87,16 +87,16 @@
+ 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ 	EndProjectSection
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+@@ -114,17 +114,17 @@
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
+-		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+-	EndProjectSection
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
+-	ProjectSection(ProjectDependencies) = postProject
+-		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+-	EndProjectSection
+-EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
++#		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
++#	EndProjectSection
++#EndProject
++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
++#	ProjectSection(ProjectDependencies) = postProject
++#		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
++#	EndProjectSection
++#EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+Only in misc/build/Python-2.7.3/PCbuild: pcbuild.sln.orig

Added: incubator/ooo/trunk/main/python/python-freebsd.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-freebsd.patch?rev=1366182&view=auto
==============================================================================
--- incubator/ooo/trunk/main/python/python-freebsd.patch (added)
+++ incubator/ooo/trunk/main/python/python-freebsd.patch Thu Jul 26 20:20:33 2012
@@ -0,0 +1,123 @@
+Only in misc/build/Python-2.7.3/Lib: plat-freebsd9
+diff -ru misc/Python-2.7.3/Lib/test/test_threading.py misc/build/Python-2.7.3/Lib/test/test_threading.py
+--- misc/Python-2.7.3/Lib/test/test_threading.py	2012-04-09 18:07:32.000000000 -0500
++++ misc/build/Python-2.7.3/Lib/test/test_threading.py	2012-07-24 22:39:03.000000000 -0500
+@@ -421,7 +421,7 @@
+     # #12316 and #11870), and fork() from a worker thread is known to trigger
+     # problems with some operating systems (issue #3863): skip problematic tests
+     # on platforms known to behave badly.
+-    platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
++    platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'netbsd5',
+                          'os2emx')
+ 
+     def _run_and_join(self, script):
+diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure
+--- misc/Python-2.7.3/Modules/_ctypes/libffi/configure	2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure	2012-07-24 22:39:03.000000000 -0500
+@@ -6289,7 +6289,7 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+diff -ru misc/Python-2.7.3/Python/thread_pthread.h misc/build/Python-2.7.3/Python/thread_pthread.h
+--- misc/Python-2.7.3/Python/thread_pthread.h	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/Python/thread_pthread.h	2012-07-24 22:39:03.000000000 -0500
+@@ -56,7 +56,6 @@
+    in default setting.  So the process scope is preferred to get
+    enough number of threads to work. */
+ #ifdef __FreeBSD__
+-#include <osreldate.h>
+ #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
+ #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
+ #endif
+@@ -161,6 +160,9 @@
+ {
+     pthread_t th;
+     int status;
++#ifdef __FreeBSD__
++	sigset_t set, oset;
++#endif
+ #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
+     pthread_attr_t attrs;
+ #endif
+@@ -172,6 +174,9 @@
+     if (!initialized)
+         PyThread_init_thread();
+ 
++#ifdef __FreeBSD__
++	SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
++#endif
+ #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
+     if (pthread_attr_init(&attrs) != 0)
+         return -1;
+@@ -189,7 +194,10 @@
+ #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
+     pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
+ #endif
+-
++#ifdef __FreeBSD__
++	sigfillset(&set);
++	SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
++#endif
+     status = pthread_create(&th,
+ #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
+                              &attrs,
+@@ -200,6 +208,9 @@
+                              (void *)arg
+                              );
+ 
++#ifdef __FreeBSD__
++	SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
++#endif
+ #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
+     pthread_attr_destroy(&attrs);
+ #endif
+diff -ru misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure
+--- misc/Python-2.7.3/configure	2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.3/configure	2012-07-24 22:39:03.000000000 -0500
+@@ -4916,7 +4916,7 @@
+           ;;
+     SunOS*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+-	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
++	  BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+           ;;
+@@ -4924,11 +4924,6 @@
+ 	  LDLIBRARY='libpython$(VERSION).so'
+ 	  BLDLIBRARY='-L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+-	  case $ac_sys_system in
+-	      FreeBSD*)
+-		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
+-		;;
+-	  esac
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+ 	  ;;
+     hp*|HP*)
+diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
+--- misc/Python-2.7.3/setup.py	2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.3/setup.py	2012-07-24 22:39:03.000000000 -0500
+@@ -1432,7 +1432,7 @@
+             macros = dict()
+             libraries = []
+ 
+-        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
++        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
+             # FreeBSD's P1003.1b semaphore support is very experimental
+             # and has many known problems. (as of June 2008)
+             macros = dict()
+@@ -1484,7 +1484,7 @@
+             missing.append('linuxaudiodev')
+ 
+         if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+-                        'freebsd7', 'freebsd8')
++                        'freebsd7', 'freebsd8', 'freebsd9')
+             or platform.startswith("gnukfreebsd")):
+             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
+         else:

Added: incubator/ooo/trunk/main/python/python-md5.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-md5.patch?rev=1366182&view=auto
==============================================================================
--- incubator/ooo/trunk/main/python/python-md5.patch (added)
+++ incubator/ooo/trunk/main/python/python-md5.patch Thu Jul 26 20:20:33 2012
@@ -0,0 +1,22 @@
+diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Setup.dist
+--- misc/Python-2.7.3/Modules/Setup.dist	2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.3/Modules/Setup.dist	2012-07-24 17:08:56.000000000 -0500
+@@ -248,14 +248,14 @@
+ # Message-Digest Algorithm, described in RFC 1321.  The necessary files
+ # md5.c and md5.h are included here.
+ 
+-#_md5 md5module.c md5.c
++_md5 md5module.c md5.c
+ 
+ 
+ # The _sha module implements the SHA checksum algorithms.
+ # (NIST's Secure Hash Algorithms.)
+-#_sha shamodule.c
+-#_sha256 sha256module.c
+-#_sha512 sha512module.c
++_sha shamodule.c
++_sha256 sha256module.c
++_sha512 sha512module.c
+ 
+ 
+ # SGI IRIX specific modules -- off by default.

Added: incubator/ooo/trunk/main/python/python-ssl.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/python-ssl.patch?rev=1366182&view=auto
==============================================================================
--- incubator/ooo/trunk/main/python/python-ssl.patch (added)
+++ incubator/ooo/trunk/main/python/python-ssl.patch Thu Jul 26 20:20:33 2012
@@ -0,0 +1,45 @@
+diff -ru misc/Python-2.7.3/PCbuild/build_ssl.py misc/build/Python-2.7.3/PCbuild/build_ssl.py
+--- misc/Python-2.7.3/PCbuild/build_ssl.py	2012-04-09 18:07:35.000000000 -0500
++++ misc/build/Python-2.7.3/PCbuild/build_ssl.py	2012-07-25 14:37:37.000000000 -0500
+@@ -253,4 +253,4 @@
+     sys.exit(rc)
+ 
+ if __name__=='__main__':
+-    main()
++    sys.exit(0)
+diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
+--- misc/Python-2.7.3/setup.py	2012-04-09 18:07:36.000000000 -0500
++++ misc/build/Python-2.7.3/setup.py	2012-07-25 14:37:37.000000000 -0500
+@@ -702,7 +702,15 @@
+         exts.append( Extension('_socket', ['socketmodule.c'],
+                                depends = ['socketmodule.h']) )
+         # Detect SSL support for the socket module (via _ssl)
++        UPDMINOR = os.environ.get('UPDMINOREXT')
++        ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
++            os.environ.get('INPATH') + '/' + \
++            'inc'
++        if UPDMINOR != None:
++            ooosslinc = ooosslinc + UPDMINOR
++        ooosslinc = ooosslinc + '/external/'
+         search_for_ssl_incs_in = [
++                              ooosslinc,
+                               '/usr/local/ssl/include',
+                               '/usr/contrib/ssl/include/'
+                              ]
+@@ -714,8 +722,15 @@
+                                ['/usr/kerberos/include'])
+             if krb5_h:
+                 ssl_incs += krb5_h
++        ooossllib = os.environ.get('SOLARVER') + '/' + \
++            os.environ.get('INPATH') + '/' + \
++            'lib'
++        if UPDMINOR != None:
++            ooosslinc = ooosslinc + UPDMINOR
++        ooosslinc = ooosslinc + '/'
+         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+-                                     ['/usr/local/ssl/lib',
++                                     [ooossllib,
++                                      '/usr/local/ssl/lib',
+                                       '/usr/contrib/ssl/lib/'
+                                      ] )
+ 

Modified: incubator/ooo/trunk/main/python/pyversion.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/pyversion.mk?rev=1366182&r1=1366181&r2=1366182&view=diff
==============================================================================
--- incubator/ooo/trunk/main/python/pyversion.mk (original)
+++ incubator/ooo/trunk/main/python/pyversion.mk Thu Jul 26 20:20:33 2012
@@ -21,8 +21,8 @@
 # when you want to change the python version, you must update the d.lst
 # in the python project accordingly !!!
 PYMAJOR=2
-PYMINOR=6
-PYMICRO=1
+PYMINOR=7
+PYMICRO=3
 PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
 
 .IF "$(GUI)" == "UNX"

Modified: incubator/ooo/trunk/main/pyuno/zipcore/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pyuno/zipcore/makefile.mk?rev=1366182&r1=1366181&r2=1366182&view=diff
==============================================================================
--- incubator/ooo/trunk/main/pyuno/zipcore/makefile.mk (original)
+++ incubator/ooo/trunk/main/pyuno/zipcore/makefile.mk Thu Jul 26 20:20:33 2012
@@ -54,9 +54,14 @@ FINDLIBFILES_TMP:=$(subst,/,$/ \
 	$(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed))
 FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP))
 
+FINDINCFILES_TMP:=$(subst,/,$/ \
+	$(shell @$(FIND) $(SOLARINCDIR)$/python -type f| $(GREP) -v "\.h~" | $(GREP) -v _failed))
+FINDINCFILES=$(subst,$(SOLARINCDIR)$/python, $(FINDINCFILES_TMP))
+
 FILES=\
 	$(PYTHONBINARY)	\
-	$(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) 
+	$(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) \
+	$(foreach,i,$(FINDINCFILES) $(DESTROOT)$/include$/python$(PYMAJOR).$(PYMINOR)$(i))
 
 .IF "$(OS)" == "WNT"
 APP1TARGET = python
@@ -101,6 +106,11 @@ $(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/py
 	-rm -f $@
 	cat $< > $@
 
+$(DESTROOT)$/include$/python$(PYMAJOR).$(PYMINOR)%: $(SOLARINCDIR)$/python$/%
+	-$(MKDIRHIER) $(@:d)
+	-rm -f $@
+	cat $< > $@
+
 .IF "$(GUI)"== "UNX"
 $(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
 	-$(MKDIRHIER) $(@:d)



Mime
View raw message