--- a/components/python/python34/patches/06-solaris-64-bit.patch Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/06-solaris-64-bit.patch Wed Oct 29 14:12:28 2014 -0700
@@ -4,9 +4,9 @@
tests that fail due to this patch. As the patch is Solaris-specific, it is
not suitable for upstream.
---- Python-3.4.1/Lib/distutils/command/build_ext.py.~1~ 2014-05-18 22:19:37.000000000 -0700
-+++ Python-3.4.1/Lib/distutils/command/build_ext.py 2014-08-05 16:07:07.494400637 -0700
-@@ -668,6 +668,9 @@
+--- Python-3.4.2/Lib/distutils/command/build_ext.py.~1~ 2014-09-22 05:56:59.000000000 -0700
++++ Python-3.4.2/Lib/distutils/command/build_ext.py 2014-09-22 14:05:09.231795935 -0700
+@@ -659,6 +659,9 @@
ext_suffix = get_config_var('EXT_SUFFIX')
if os.name == 'nt' and self.debug:
return os.path.join(*ext_path) + '_d' + ext_suffix
@@ -16,9 +16,9 @@
return os.path.join(*ext_path) + ext_suffix
def get_export_symbols(self, ext):
---- Python-3.4.1/Lib/distutils/tests/test_build_ext.py.~1~ 2014-05-18 22:19:38.000000000 -0700
-+++ Python-3.4.1/Lib/distutils/tests/test_build_ext.py 2014-08-05 15:28:29.067709834 -0700
-@@ -317,7 +317,8 @@
+--- Python-3.4.2/Lib/distutils/tests/test_build_ext.py.~1~ 2014-09-22 05:56:59.000000000 -0700
++++ Python-3.4.2/Lib/distutils/tests/test_build_ext.py 2014-09-22 14:08:54.798141164 -0700
+@@ -315,7 +315,8 @@
ext_suffix = sysconfig.get_config_var('EXT_SUFFIX')
self.assertTrue(so_file.endswith(ext_suffix))
so_dir = os.path.dirname(so_file)
@@ -28,7 +28,7 @@
cmd.inplace = 0
cmd.compiler = None
-@@ -326,7 +327,8 @@
+@@ -324,7 +325,8 @@
self.assertTrue(os.path.exists(so_file))
self.assertTrue(so_file.endswith(ext_suffix))
so_dir = os.path.dirname(so_file)
@@ -38,7 +38,7 @@
# inplace = 0, cmd.package = 'bar'
build_py = cmd.get_finalized_command('build_py')
-@@ -334,7 +336,8 @@
+@@ -332,7 +334,8 @@
path = cmd.get_ext_fullpath('foo')
# checking that the last directory is the build_dir
path = os.path.split(path)[0]
@@ -48,7 +48,7 @@
# inplace = 1, cmd.package = 'bar'
cmd.inplace = 1
-@@ -348,7 +351,8 @@
+@@ -346,7 +349,8 @@
# checking that the last directory is bar
path = os.path.split(path)[0]
lastdir = os.path.split(path)[-1]
@@ -58,7 +58,7 @@
def test_ext_fullpath(self):
ext = sysconfig.get_config_var('EXT_SUFFIX')
-@@ -364,14 +368,16 @@
+@@ -362,14 +366,16 @@
curdir = os.getcwd()
wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
path = cmd.get_ext_fullpath('lxml.etree')
@@ -77,7 +77,7 @@
# building twisted.runner.portmap not inplace
build_py = cmd.get_finalized_command('build_py')
-@@ -380,13 +386,15 @@
+@@ -378,13 +384,15 @@
path = cmd.get_ext_fullpath('twisted.runner.portmap')
wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
'portmap' + ext)
@@ -95,15 +95,15 @@
@unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
---- Python-3.4.1/Lib/distutils/tests/test_sysconfig.py.~1~ 2014-05-18 22:19:38.000000000 -0700
-+++ Python-3.4.1/Lib/distutils/tests/test_sysconfig.py 2014-08-05 13:11:56.906745265 -0700
+--- Python-3.4.2/Lib/distutils/tests/test_sysconfig.py.~1~ 2014-09-22 05:56:59.000000000 -0700
++++ Python-3.4.2/Lib/distutils/tests/test_sysconfig.py 2014-09-22 14:10:18.427824361 -0700
@@ -1,4 +1,5 @@
"""Tests for distutils.sysconfig."""
+import sys
import os
import shutil
- import unittest
-@@ -124,6 +125,8 @@
+ import subprocess
+@@ -127,6 +128,8 @@
def test_sysconfig_module(self):
import sysconfig as global_sysconfig
@@ -112,7 +112,7 @@
self.assertEqual(global_sysconfig.get_config_var('CFLAGS'),
sysconfig.get_config_var('CFLAGS'))
self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'),
-@@ -149,8 +152,9 @@
+@@ -152,8 +155,9 @@
import sysconfig as global_sysconfig
if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
self.skipTest('compiler flags customized')