Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 593586 | Differences between
and this patch

Collapse All | Expand All

(-)a/Lib/stat.py (-3 / +4 lines)
Lines 37-45 S_IFDIR = 0o040000 # directory Link Here
37
S_IFCHR  = 0o020000  # character device
37
S_IFCHR  = 0o020000  # character device
38
S_IFBLK  = 0o060000  # block device
38
S_IFBLK  = 0o060000  # block device
39
S_IFREG  = 0o100000  # regular file
39
S_IFREG  = 0o100000  # regular file
40
S_IFIFO  = 0o010000  # fifo (named pipe)
40
S_IFIFO  = 0o120000  # fifo (named pipe)
41
S_IFLNK  = 0o120000  # symbolic link
41
S_IFLNK  = 0o160000  # symbolic link
42
S_IFSOCK = 0o140000  # socket file
42
S_IFSOCK = 0o010000  # socket file
43
43
44
44
# Functions to test for each file type
45
# Functions to test for each file type
45
46
(-)a/Makefile.pre.in (+1 lines)
Lines 1355-1360 libainstall: all python-config Link Here
1355
	$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
1355
	$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup
1356
	$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
1356
	$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local
1357
	$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
1357
	$(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config
1358
	sed -i -e "s/@LOCALMODLIBS@/${LOCALMODLIBS}/" Misc/python.pc
1358
	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc
1359
	$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc
1359
	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
1360
	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
1360
	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
1361
	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
(-)a/Misc/python.pc.in (-1 / +1 lines)
Lines 8-13 Name: Python Link Here
8
Description: Python library
8
Description: Python library
9
Requires: 
9
Requires: 
10
Version: @VERSION@
10
Version: @VERSION@
11
Libs.private: @LIBS@
12
Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
11
Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
12
Libs.private: @LOCALMODLIBS@ @LIBS@
13
Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@
13
Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@
(-)a/Modules/Setup.dist (-46 / +63 lines)
Lines 120-126 atexit atexitmodule.c # Register fu Link Here
120
_stat _stat.c			# stat.h interface
120
_stat _stat.c			# stat.h interface
121
121
122
# access to ISO C locale support
122
# access to ISO C locale support
123
_locale _localemodule.c  # -lintl
123
_locale _localemodule.c -lintl
124
124
125
# Standard I/O baseline
125
# Standard I/O baseline
126
_io -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
126
_io -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
Lines 162-230 faulthandler faulthandler.c Link Here
162
# it, depending on your system -- see the GNU readline instructions.
162
# it, depending on your system -- see the GNU readline instructions.
163
# It's okay for this to be a shared library, too.
163
# It's okay for this to be a shared library, too.
164
164
165
#readline readline.c -lreadline -ltermcap
165
readline readline.c -lreadline -lncurses
166
166
167
167
168
# Modules that should always be present (non UNIX dependent):
168
# Modules that should always be present (non UNIX dependent):
169
169
170
#array arraymodule.c	# array objects
170
array arraymodule.c	# array objects
171
#cmath cmathmodule.c _math.c # -lm # complex math library functions
171
cmath cmathmodule.c _math.c # -lm # complex math library functions
172
#math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
172
math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
173
#_struct _struct.c	# binary structure packing/unpacking
173
_struct _struct.c	# binary structure packing/unpacking
174
#time timemodule.c # -lm # time operations and variables
174
time timemodule.c # -lm # time operations and variables
175
#_weakref _weakref.c	# basic weak reference support
175
_weakref _weakref.c	# basic weak reference support
176
#_testcapi _testcapimodule.c    # Python C API test module
176
_testcapi _testcapimodule.c    # Python C API test module
177
#_random _randommodule.c	# Random number generator
177
_random _randommodule.c	# Random number generator
178
#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
178
atexit atexitmodule.c      # Register functions to be run at interpreter-shutdown
179
#_pickle _pickle.c	# pickle accelerator
179
_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
180
#_datetime _datetimemodule.c	# datetime accelerator
180
_pickle _pickle.c	# pickle accelerator
181
#_bisect _bisectmodule.c	# Bisection algorithms
181
_datetime _datetimemodule.c	# datetime accelerator
182
#_heapq _heapqmodule.c	# Heap queue algorithm
182
_bisect _bisectmodule.c	# Bisection algorithms
183
_heapq _heapqmodule.c	# Heap queue algorithm
183
184
184
#unicodedata unicodedata.c    # static Unicode character database
185
unicodedata unicodedata.c    # static Unicode character database
185
186
186
187
187
# Modules with some UNIX dependencies -- on by default:
188
# Modules with some UNIX dependencies -- on by default:
188
# (If you have a really backward UNIX, select and socket may not be
189
# (If you have a really backward UNIX, select and socket may not be
189
# supported...)
190
# supported...)
190
191
191
#fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
192
fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
192
#spwd spwdmodule.c		# spwd(3)
193
spwd spwdmodule.c		# spwd(3) 
193
#grp grpmodule.c		# grp(3)
194
grp grpmodule.c		# grp(3)
194
#select selectmodule.c	# select(2); not on ancient System V
195
select selectmodule.c	# select(2); not on ancient System V
195
196
196
# Memory-mapped files (also works on Win32).
197
# Memory-mapped files (also works on Win32).
197
#mmap mmapmodule.c
198
#mmap mmapmodule.c
198
199
199
# CSV file helper
200
# CSV file helper
200
#_csv _csv.c
201
_csv _csv.c
201
202
202
# Socket module helper for socket(2)
203
# Socket module helper for socket(2)
203
#_socket socketmodule.c
204
_socket socketmodule.c
204
205
205
# Socket module helper for SSL support; you must comment out the other
206
# Socket module helper for SSL support; you must comment out the other
206
# socket line above, and possibly edit the SSL variable:
207
# socket line above, and possibly edit the SSL variable:
207
#SSL=/usr/local/ssl
208
#SSL=/usr/local/ssl
208
#_ssl _ssl.c \
209
_ssl _ssl.c \
209
#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
210
	-DUSE_SSL \
210
#	-L$(SSL)/lib -lssl -lcrypto
211
	-lssl -lcrypto -lz
211
212
212
# The crypt module is now disabled by default because it breaks builds
213
# The crypt module is now disabled by default because it breaks builds
213
# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
214
# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
214
#
215
#
215
# First, look at Setup.config; configure may have set this for you.
216
# First, look at Setup.config; configure may have set this for you.
216
217
217
#_crypt _cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
218
_crypt _cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
218
219
219
220
220
# Some more UNIX dependent modules -- off by default, since these
221
# Some more UNIX dependent modules -- off by default, since these
221
# are not supported by all UNIX systems:
222
# are not supported by all UNIX systems:
222
223
223
#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
224
#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
224
#termios termios.c	# Steen Lumholt's termios module
225
termios termios.c	# Steen Lumholt's termios module
225
#resource resource.c	# Jeremy Hylton's rlimit interface
226
resource resource.c	# Jeremy Hylton's rlimit interface
226
227
227
#_posixsubprocess _posixsubprocess.c  # POSIX subprocess module helper
228
_posixsubprocess _posixsubprocess.c  # POSIX subprocess module helper
228
229
229
# Multimedia modules -- off by default.
230
# Multimedia modules -- off by default.
230
# These don't work for 64-bit platforms!!!
231
# These don't work for 64-bit platforms!!!
Lines 240-253 faulthandler faulthandler.c Link Here
240
# The _md5 module implements the RSA Data Security, Inc. MD5
241
# The _md5 module implements the RSA Data Security, Inc. MD5
241
# Message-Digest Algorithm, described in RFC 1321.
242
# Message-Digest Algorithm, described in RFC 1321.
242
243
243
#_md5 md5module.c
244
_md5 md5module.c
244
245
245
246
246
# The _sha module implements the SHA checksum algorithms.
247
# The _sha module implements the SHA checksum algorithms.
247
# (NIST's Secure Hash Algorithms.)
248
# (NIST's Secure Hash Algorithms.)
248
#_sha1 sha1module.c
249
_sha1 sha1module.c
249
#_sha256 sha256module.c
250
_sha256 sha256module.c
250
#_sha512 sha512module.c
251
_sha512 sha512module.c
251
252
252
253
253
# The _tkinter module.
254
# The _tkinter module.
Lines 294-300 faulthandler faulthandler.c Link Here
294
#	-lX11
295
#	-lX11
295
296
296
# Lance Ellinghaus's syslog module
297
# Lance Ellinghaus's syslog module
297
#syslog syslogmodule.c		# syslog daemon interface
298
syslog syslogmodule.c		# syslog daemon interface
298
299
299
300
300
# Curses support, requiring the System V version of curses, often
301
# Curses support, requiring the System V version of curses, often
Lines 303-311 faulthandler faulthandler.c Link Here
303
#
304
#
304
# First, look at Setup.config; configure may have set this for you.
305
# First, look at Setup.config; configure may have set this for you.
305
306
306
#_curses _cursesmodule.c -lcurses -ltermcap
307
_curses _cursesmodule.c -lncurses
307
# Wrapper for the panel library that's part of ncurses and SYSV curses.
308
# Wrapper for the panel library that's part of ncurses and SYSV curses.
308
#_curses_panel _curses_panel.c -lpanel -lncurses
309
_curses_panel _curses_panel.c -lpanel -lncurses 
309
310
310
311
311
# Modules that provide persistent dictionary-like semantics.  You will
312
# Modules that provide persistent dictionary-like semantics.  You will
Lines 332-341 faulthandler faulthandler.c Link Here
332
333
333
334
334
# Helper module for various ascii-encoders
335
# Helper module for various ascii-encoders
335
#binascii binascii.c
336
binascii binascii.c
336
337
337
# Fred Drake's interface to the Python parser
338
# Fred Drake's interface to the Python parser
338
#parser parsermodule.c
339
parser parsermodule.c
339
340
340
341
341
# Lee Busby's SIGFPE modules.
342
# Lee Busby's SIGFPE modules.
Lines 371-392 faulthandler faulthandler.c Link Here
371
#
372
#
372
# More information on Expat can be found at www.libexpat.org.
373
# More information on Expat can be found at www.libexpat.org.
373
#
374
#
374
#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI
375
pyexpat pyexpat.c -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI -lexpat
375
376
376
# Hye-Shik Chang's CJKCodecs
377
# Hye-Shik Chang's CJKCodecs
377
378
378
# multibytecodec is required for all the other CJK codec modules
379
# multibytecodec is required for all the other CJK codec modules
379
#_multibytecodec cjkcodecs/multibytecodec.c
380
_multibytecodec cjkcodecs/multibytecodec.c
380
381
381
#_codecs_cn cjkcodecs/_codecs_cn.c
382
_codecs_cn cjkcodecs/_codecs_cn.c
382
#_codecs_hk cjkcodecs/_codecs_hk.c
383
_codecs_hk cjkcodecs/_codecs_hk.c
383
#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
384
_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
384
#_codecs_jp cjkcodecs/_codecs_jp.c
385
_codecs_jp cjkcodecs/_codecs_jp.c
385
#_codecs_kr cjkcodecs/_codecs_kr.c
386
_codecs_kr cjkcodecs/_codecs_kr.c
386
#_codecs_tw cjkcodecs/_codecs_tw.c
387
_codecs_tw cjkcodecs/_codecs_tw.c
387
388
388
# Example -- included for reference only:
389
# Example -- included for reference only:
389
# xx xxmodule.c
390
# xx xxmodule.c
390
391
391
# Another example -- the 'xxsubtype' module shows C-level subtyping in action
392
# Another example -- the 'xxsubtype' module shows C-level subtyping in action
392
xxsubtype xxsubtype.c
393
xxsubtype xxsubtype.c
394
395
_bz2 _bz2module.c -lbz2
396
zlib zlibmodule.c -lz
397
posix posixmodule.c
398
_io _io/_iomodule.c _io/stringio.c _io/fileio.c _io/textio.c _io/bytesio.c _io/bufferedio.c _io/iobase.c
399
_json _json.c
400
_lsprof _lsprof.c rotatingtree.c
401
_hashlib _hashopenssl.c
402
_multiprocessing _multiprocessing/multiprocessing.c
403
SQLITE3DEFS=-DSQLITE_OMIT_LOAD_EXTENSION=1
404
SQLITE3MOD=-DMODULE_NAME='"sqlite3"'
405
_sqlite3 $(SQLITE3DEFS) $(SQLITE3MOD) _sqlite/cache.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c -lsqlite3
406
xxlimited xxlimited.c
407
_decimal -DANSI -DCONFIG_32 _decimal/_decimal.c _decimal/libmpdec/basearith.c _decimal/libmpdec/constants.c _decimal/libmpdec/context.c _decimal/libmpdec/convolute.c _decimal/libmpdec/crt.c _decimal/libmpdec/difradix2.c _decimal/libmpdec/fnt.c _decimal/libmpdec/fourstep.c _decimal/libmpdec/io.c _decimal/libmpdec/memory.c _decimal/libmpdec/mpdecimal.c _decimal/libmpdec/numbertheory.c _decimal/libmpdec/sixstep.c _decimal/libmpdec/transpose.c -I$(srcdir)/Modules/_decimal/libmpdec
408
_lzma _lzmamodule.c -llzma
409
_testbuffer _testbuffer.c
(-)a/Modules/_testcapimodule.c (+10 lines)
Lines 10-16 Link Here
10
#include "Python.h"
10
#include "Python.h"
11
#include <float.h>
11
#include <float.h>
12
#include "structmember.h"
12
#include "structmember.h"
13
14
/* Differentiate between building the core module and building extension
15
 * modules.
16
 */
17
#ifdef Py_BUILD_CORE
18
#undef Py_BUILD_CORE
13
#include "datetime.h"
19
#include "datetime.h"
20
#define Py_BUILD_CORE
21
#else
22
#include "datetime.h"
23
#endif
14
#include "marshal.h"
24
#include "marshal.h"
15
25
16
#ifdef WITH_THREAD
26
#ifdef WITH_THREAD
(-)a/Modules/posixmodule.c (-2 / +4 lines)
Lines 9184-9190 posix_WSTOPSIG(PyObject *self, PyObject Link Here
9184
#endif /* HAVE_SYS_WAIT_H */
9184
#endif /* HAVE_SYS_WAIT_H */
9185
9185
9186
9186
9187
#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
9187
#if (defined(HAVE_STATVFS) || defined(HAVE_FSTATVFS)) && defined(HAVE_SYS_STATVFS_H)
9188
#ifdef _SCO_DS
9188
#ifdef _SCO_DS
9189
/* SCO OpenServer 5.0 and later requires _SVID3 before it reveals the
9189
/* SCO OpenServer 5.0 and later requires _SVID3 before it reveals the
9190
   needed definitions in sys/statvfs.h */
9190
   needed definitions in sys/statvfs.h */
Lines 9234-9240 static PyObject* Link Here
9234
9234
9235
    return v;
9235
    return v;
9236
}
9236
}
9237
9237
#endif
9238
9239
#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
9238
PyDoc_STRVAR(posix_fstatvfs__doc__,
9240
PyDoc_STRVAR(posix_fstatvfs__doc__,
9239
"fstatvfs(fd) -> statvfs result\n\n\
9241
"fstatvfs(fd) -> statvfs result\n\n\
9240
Perform an fstatvfs system call on the given fd.\n\
9242
Perform an fstatvfs system call on the given fd.\n\
(-)a/Modules/python.c (+4 lines)
Lines 15-20 wmain(int argc, wchar_t **argv) Link Here
15
}
15
}
16
#else
16
#else
17
17
18
#ifdef atarist
19
long _stksize = 512*1024;
20
#endif
21
18
int
22
int
19
main(int argc, char **argv)
23
main(int argc, char **argv)
20
{
24
{
(-)a/Python/pythonrun.c (+2 lines)
Lines 265-270 get_locale_encoding(void) Link Here
265
        return NULL;
265
        return NULL;
266
    }
266
    }
267
    return get_codec_name(codeset);
267
    return get_codec_name(codeset);
268
#elif defined(__MINT__)
269
    return get_codec_name("ASCII");
268
#else
270
#else
269
    PyErr_SetNone(PyExc_NotImplementedError);
271
    PyErr_SetNone(PyExc_NotImplementedError);
270
    return NULL;
272
    return NULL;
(-)a/setup.py (-2 / +7 lines)
Lines 620-626 class PyBuildExt(build_ext): Link Here
620
        exts.append( Extension('parser', ['parsermodule.c']) )
620
        exts.append( Extension('parser', ['parsermodule.c']) )
621
621
622
        # Memory-mapped files (also works on Win32).
622
        # Memory-mapped files (also works on Win32).
623
        exts.append( Extension('mmap', ['mmapmodule.c']) )
623
        if host_platform != 'freemint1':
624
            exts.append( Extension('mmap', ['mmapmodule.c']) )
624
625
625
        # Lance Ellinghaus's syslog module
626
        # Lance Ellinghaus's syslog module
626
        # syslog daemon interface
627
        # syslog daemon interface
Lines 638-644 class PyBuildExt(build_ext): Link Here
638
        # Operations on audio samples
639
        # Operations on audio samples
639
        # According to #993173, this one should actually work fine on
640
        # According to #993173, this one should actually work fine on
640
        # 64-bit platforms.
641
        # 64-bit platforms.
641
        exts.append( Extension('audioop', ['audioop.c']) )
642
        if host_platform != 'freemint1':
643
            exts.append( Extension('audioop', ['audioop.c']) )
642
644
643
        # readline
645
        # readline
644
        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
646
        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
Lines 1740-1745 class PyBuildExt(build_ext): Link Here
1740
                   '_ctypes/cfield.c']
1742
                   '_ctypes/cfield.c']
1741
        depends = ['_ctypes/ctypes.h']
1743
        depends = ['_ctypes/ctypes.h']
1742
1744
1745
        if host_platform == 'freemint1':
1746
            return
1747
1743
        if host_platform == 'darwin':
1748
        if host_platform == 'darwin':
1744
            sources.append('_ctypes/malloc_closure.c')
1749
            sources.append('_ctypes/malloc_closure.c')
1745
            sources.append('_ctypes/darwin/dlfcn_simple.c')
1750
            sources.append('_ctypes/darwin/dlfcn_simple.c')

Return to bug 593586