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.
This commit is contained in:
parent
deb39b5fef
commit
fba7369824
|
@ -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"]
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
6
setup.py
6
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')
|
||||
|
|
Loading…
Reference in New Issue