From fba73698240660d9154b6917b87dd333d6fb8284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 13 Nov 2004 11:13:35 +0000 Subject: Patch #1050475: Fix various x86_64 build issues regrtest.py: skip rgbimg and imageop as they are not built on 64-bit systems. _tkinter.c: replace %.8x with %p for printing pointers. setup.py: add lib64 into the library directories. --- Lib/test/regrtest.py | 4 ++++ Modules/_tkinter.c | 4 ++-- setup.py | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 400cb48..4835e64 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -1099,6 +1099,10 @@ class _ExpectedSkips: if eval('test_codecmaps_' + cc).skip_expected: self.expected.add('test_codecmaps_' + cc) + if sys.maxint == 9223372036854775807L: + self.expected.add('test_rgbimg') + self.expected.add('test_imageop') + if not sys.platform in ("mac", "darwin"): MAC_ONLY = ["test_macostools", "test_macfs", "test_aepack", "test_plistlib", "test_scriptpackages"] diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 852bde4..76c2a44 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -805,8 +805,8 @@ static PyObject * PyTclObject_repr(PyTclObject *self) { char buf[50]; - PyOS_snprintf(buf, 50, "<%s object at 0x%.8x>", - self->value->typePtr->name, (int)self->value); + PyOS_snprintf(buf, 50, "<%s object at %p>", + self->value->typePtr->name, self->value); return PyString_FromString(buf); } diff --git a/setup.py b/setup.py index 5450b20..08d951e 100644 --- a/setup.py +++ b/setup.py @@ -265,7 +265,10 @@ class PyBuildExt(build_ext): # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. - lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib', '/usr/lib/lib64'] + lib_dirs = self.compiler.library_dirs + [ + '/lib64', '/usr/lib64', + '/lib', '/usr/lib', + ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] exts = [] @@ -990,6 +993,7 @@ class PyBuildExt(build_ext): added_lib_dirs.append('/usr/openwin/lib') elif os.path.exists('/usr/X11R6/include'): include_dirs.append('/usr/X11R6/include') + added_lib_dirs.append('/usr/X11R6/lib64') added_lib_dirs.append('/usr/X11R6/lib') elif os.path.exists('/usr/X11R5/include'): include_dirs.append('/usr/X11R5/include') -- cgit v0.12