Attachment #362344 for bug #489940

View | Details | Raw Unified | Return to bug 489940
Collapse All | Expand All

Lines 31-39 S_IFDIR = 0040000 Link Here

(-)a/Lib/stat.py (-3 / +3 lines)
31	S_IFCHR = 0020000	31	S_IFCHR = 0020000
32	S_IFBLK = 0060000	32	S_IFBLK = 0060000
33	S_IFREG = 0100000	33	S_IFREG = 0100000
34	S_IFIFO = 0010000	34	S_IFIFO = 0120000
35	S_IFLNK = 0120000	35	S_IFLNK = 0160000
36	S_IFSOCK = 0140000	36	S_IFSOCK = 0010000
37		37
38	# Functions to test for each file type	38	# Functions to test for each file type
39		39

Lines 17-22 Link Here

(-)a/Modules/python.c (+4 lines)
17	#endif	17	#endif
18	#endif	18	#endif
19		19
		20	#ifdef atarist
		21	long _stksize = 512*1024;
		22	#endif
		23
20	int	24	int
21	main(int argc, char **argv)	25	main(int argc, char **argv)
22	{	26	{




#include "Python.h"
#include <float.h>
#include "structmember.h"

/* Differentiate between building the core module and building extension
 * modules.
 */
#ifdef Py_BUILD_CORE
#undef Py_BUILD_CORE
#include "datetime.h"
#define Py_BUILD_CORE
#else
#include "datetime.h"
#endif

#ifdef WITH_THREAD
#include "pythread.h"

Lines 250-256 Link Here

(-)a/setup.py (-2 / +8 lines)
250		263
251	build_ext.build_extensions(self)	264	build_ext.build_extensions(self)
252		265
253	longest = max([len(e.name) for e in self.extensions])	266	longest = 0
		267	for e in self.extensions:
		268	longest = max(longest, len(e.name))
		269
254	if self.failed:	270	if self.failed:
255	longest = max(longest, max([len(name) for name in self.failed]))	271	longest = max(longest, max([len(name) for name in self.failed]))
256		272
Lines 630-636 Link Here
630	exts.append( Extension('cPickle', ['cPickle.c']) )	630	exts.append( Extension('cPickle', ['cPickle.c']) )
631		631
632	# Memory-mapped files (also works on Win32).	632	# Memory-mapped files (also works on Win32).
633	if host_platform not in ['atheos']:	633	if host_platform not in ['atheos', 'freemint1']:
634	exts.append( Extension('mmap', ['mmapmodule.c']) )	634	exts.append( Extension('mmap', ['mmapmodule.c']) )
635	else:	635	else:
636	missing.append('mmap')	636	missing.append('mmap')
Lines 1847-1852 Link Here
1847	'_ctypes/cfield.c']	1847	'_ctypes/cfield.c']
1848	depends = ['_ctypes/ctypes.h']	1848	depends = ['_ctypes/ctypes.h']
1849		1849
		1850	if host_platform == 'freemint1':
		1851	return
		1852
1850	if host_platform == 'darwin':	1853	if host_platform == 'darwin':
1851	sources.append('_ctypes/malloc_closure.c')	1854	sources.append('_ctypes/malloc_closure.c')
1852	sources.append('_ctypes/darwin/dlfcn_simple.c')	1855	sources.append('_ctypes/darwin/dlfcn_simple.c')




# It's okay for this to be a shared library, too.

#readline readline.c -lreadline -ltermcap
readline readline.c -lreadline -lncurses


# Modules that should always be present (non UNIX dependent):

array arraymodule.c	# array objects
cmath cmathmodule.c _math.c # -lm # complex math library functions
math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
_struct _struct.c	# binary structure packing/unpacking
time timemodule.c # -lm # time operations and variables
operator operator.c	# operator.add() and similar goodies
_testcapi _testcapimodule.c    # Python C API test module
_random _randommodule.c	# Random number generator
_collections _collectionsmodule.c # Container types
_heapq _heapqmodule.c		# Heapq type
itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
strop stropmodule.c		# String manipulations
_functools _functoolsmodule.c	# Tools for working with functions and callable objects
_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c	# elementtree accelerator
#_pickle _pickle.c	# pickle accelerator
datetime datetimemodule.c	# date/time type
_bisect _bisectmodule.c	# Bisection algorithms

unicodedata unicodedata.c    # static Unicode character database

# access to ISO C locale support
_locale _localemodule.c -lintl -liconv

# Standard I/O baseline
#_io -I$(srcdir)/Modules/_io _io/bufferedio.c _io/bytesio.c _io/fileio.c _io/iobase.c _io/_iomodule.c _io/stringio.c _io/textio.c

# (If you have a really backward UNIX, select and socket may not be
# supported...)

fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
spwd spwdmodule.c		# spwd(3) 
grp grpmodule.c		# grp(3)
select selectmodule.c	# select(2); not on ancient System V

# Memory-mapped files (also works on Win32).
#mmap mmapmodule.c

# CSV file helper
_csv _csv.c

# Socket module helper for socket(2)
_socket socketmodule.c timemodule.c

# Socket module helper for SSL support; you must comment out the other
# socket line above, and possibly edit the SSL variable:

#_ssl _ssl.c \
#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
#	-L$(SSL)/lib -lssl -lcrypto
_ssl _ssl.c \
	-DUSE_SSL \
	-lssl -lcrypto -lz

# The crypt module is now disabled by default because it breaks builds
# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
#
# First, look at Setup.config; configure may have set this for you.

crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems


# Some more UNIX dependent modules -- off by default, since these
# are not supported by all UNIX systems:

#nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
termios termios.c	# Steen Lumholt's termios module
resource resource.c	# Jeremy Hylton's rlimit interface


# Multimedia modules -- off by default.

# #993173 says audioop works on 64-bit platforms, though.
# These represent audio samples or images as strings:

audioop audioop.c	# Operations on audio samples
imageop imageop.c	# Operations on images


# Note that the _md5 and _sha modules are normally only built if the

# Message-Digest Algorithm, described in RFC 1321.  The necessary files
# md5.c and md5.h are included here.

_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


# SGI IRIX specific modules -- off by default.


# George Neville-Neil's timing module:

timing timingmodule.c


# The _tkinter module.

#	-lX11

# Lance Ellinghaus's syslog module
syslog syslogmodule.c		# syslog daemon interface


# Curses support, requring the System V version of curses, often

#
# First, look at Setup.config; configure may have set this for you.

_curses _cursesmodule.c -lncurses
# Wrapper for the panel library that's part of ncurses and SYSV curses.
_curses_panel _curses_panel.c -lpanel -lncurses 


# Generic (SunOS / SVR4) dynamic loading module.



# Helper module for various ascii-encoders
binascii binascii.c

# Fred Drake's interface to the Python parser
parser parsermodule.c

# cStringIO and cPickle
cStringIO cStringIO.c
cPickle cPickle.c


# Lee Busby's SIGFPE modules.

#
# More information on Expat can be found at www.libexpat.org.
#
pyexpat pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI -lexpat 


# Hye-Shik Chang's CJKCodecs

# multibytecodec is required for all the other CJK codec modules
_multibytecodec cjkcodecs/multibytecodec.c

_codecs_cn cjkcodecs/_codecs_cn.c
_codecs_hk cjkcodecs/_codecs_hk.c
_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
_codecs_jp cjkcodecs/_codecs_jp.c
_codecs_kr cjkcodecs/_codecs_kr.c
_codecs_tw cjkcodecs/_codecs_tw.c

# Example -- included for reference only:
# xx xxmodule.c

# Another example -- the 'xxsubtype' module shows C-level subtyping in action
xxsubtype xxsubtype.c

datetime datetimemodule.c
bz2 bz2module.c -lbz2
zlib zlibmodule.c -lz
posix posixmodule.c
_io _io/_iomodule.c _io/stringio.c _io/fileio.c _io/textio.c _io/bytesio.c _io/bufferedio.c _io/iobase.c
_json _json.c
future_builtins future_builtins.c
_lsprof _lsprof.c rotatingtree.c
_hashlib _hashopenssl.c
_hotshot _hotshot.c
_multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/socket_connection.c
SQLITE3DEFS=-DSQLITE_OMIT_LOAD_EXTENSION=1
SQLITE3MOD=-DMODULE_NAME='"sqlite3"'
_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

Return to bug 489940

Lines 164-195 Link Here

(-)a/Modules/Setup.dist (-49 / +68 lines)
164	# It's okay for this to be a shared library, too.	164	# It's okay for this to be a shared library, too.
165		165
166	#readline readline.c -lreadline -ltermcap	166	#readline readline.c -lreadline -ltermcap
		167	readline readline.c -lreadline -lncurses
167		168
168		169
169	# Modules that should always be present (non UNIX dependent):	170	# Modules that should always be present (non UNIX dependent):
170		171
171	#array arraymodule.c # array objects	172	array arraymodule.c # array objects
172	#cmath cmathmodule.c _math.c # -lm # complex math library functions	173	cmath cmathmodule.c _math.c # -lm # complex math library functions
173	#math mathmodule.c _math.c # -lm # math library functions, e.g. sin()	174	math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
174	#_struct _struct.c # binary structure packing/unpacking	175	_struct _struct.c # binary structure packing/unpacking
175	#time timemodule.c # -lm # time operations and variables	176	time timemodule.c # -lm # time operations and variables
176	#operator operator.c # operator.add() and similar goodies	177	operator operator.c # operator.add() and similar goodies
177	#_testcapi _testcapimodule.c # Python C API test module	178	_testcapi _testcapimodule.c # Python C API test module
178	#_random _randommodule.c # Random number generator	179	_random _randommodule.c # Random number generator
179	#_collections _collectionsmodule.c # Container types	180	_collections _collectionsmodule.c # Container types
180	#_heapq _heapqmodule.c # Heapq type	181	_heapq _heapqmodule.c # Heapq type
181	#itertools itertoolsmodule.c # Functions creating iterators for efficient looping	182	itertools itertoolsmodule.c # Functions creating iterators for efficient looping
182	#strop stropmodule.c # String manipulations	183	strop stropmodule.c # String manipulations
183	#_functools _functoolsmodule.c # Tools for working with functions and callable objects	184	_functools _functoolsmodule.c # Tools for working with functions and callable objects
184	#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator	185	_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator
185	#_pickle _pickle.c # pickle accelerator	186	#_pickle _pickle.c # pickle accelerator
186	#datetime datetimemodule.c # date/time type	187	datetime datetimemodule.c # date/time type
187	#_bisect _bisectmodule.c # Bisection algorithms	188	_bisect _bisectmodule.c # Bisection algorithms
188		189
189	#unicodedata unicodedata.c # static Unicode character database	190	unicodedata unicodedata.c # static Unicode character database
190		191
191	# access to ISO C locale support	192	# access to ISO C locale support
192	#_locale _localemodule.c # -lintl	193	_locale _localemodule.c -lintl -liconv
193		194
194	# Standard I/O baseline	195	# Standard I/O baseline
195	#_io -I$(srcdir)/Modules/_io _io/bufferedio.c _io/bytesio.c _io/fileio.c _io/iobase.c _io/_iomodule.c _io/stringio.c _io/textio.c	196	#_io -I$(srcdir)/Modules/_io _io/bufferedio.c _io/bytesio.c _io/fileio.c _io/iobase.c _io/_iomodule.c _io/stringio.c _io/textio.c
Lines 199-217 Link Here
199	# (If you have a really backward UNIX, select and socket may not be	200	# (If you have a really backward UNIX, select and socket may not be
200	# supported...)	201	# supported...)
201		202
202	#fcntl fcntlmodule.c # fcntl(2) and ioctl(2)	203	fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
203	#spwd spwdmodule.c # spwd(3)	204	spwd spwdmodule.c # spwd(3)
204	#grp grpmodule.c # grp(3)	205	grp grpmodule.c # grp(3)
205	#select selectmodule.c # select(2); not on ancient System V	206	select selectmodule.c # select(2); not on ancient System V
206		207
207	# Memory-mapped files (also works on Win32).	208	# Memory-mapped files (also works on Win32).
208	#mmap mmapmodule.c	209	#mmap mmapmodule.c
209		210
210	# CSV file helper	211	# CSV file helper
211	#_csv _csv.c	212	_csv _csv.c
212		213
213	# Socket module helper for socket(2)	214	# Socket module helper for socket(2)
214	#_socket socketmodule.c timemodule.c	215	_socket socketmodule.c timemodule.c
215		216
216	# Socket module helper for SSL support; you must comment out the other	217	# Socket module helper for SSL support; you must comment out the other
217	# socket line above, and possibly edit the SSL variable:	218	# socket line above, and possibly edit the SSL variable:
Lines 219-239 Link Here
219	#_ssl _ssl.c \	220	#_ssl _ssl.c \
220	# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \	221	# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
221	# -L$(SSL)/lib -lssl -lcrypto	222	# -L$(SSL)/lib -lssl -lcrypto
		223	_ssl _ssl.c \
		224	-DUSE_SSL \
		225	-lssl -lcrypto -lz
222		226
223	# The crypt module is now disabled by default because it breaks builds	227	# The crypt module is now disabled by default because it breaks builds
224	# on many systems (where -lcrypt is needed), e.g. Linux (I believe).	228	# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
225	#	229	#
226	# First, look at Setup.config; configure may have set this for you.	230	# First, look at Setup.config; configure may have set this for you.
227		231
228	#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems	232	crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
229		233
230		234
231	# Some more UNIX dependent modules -- off by default, since these	235	# Some more UNIX dependent modules -- off by default, since these
232	# are not supported by all UNIX systems:	236	# are not supported by all UNIX systems:
233		237
234	#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere	238	#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere
235	#termios termios.c # Steen Lumholt's termios module	239	termios termios.c # Steen Lumholt's termios module
236	#resource resource.c # Jeremy Hylton's rlimit interface	240	resource resource.c # Jeremy Hylton's rlimit interface
237		241
238		242
239	# Multimedia modules -- off by default.	243	# Multimedia modules -- off by default.
Lines 241-248 Link Here
241	# #993173 says audioop works on 64-bit platforms, though.	245	# #993173 says audioop works on 64-bit platforms, though.
242	# These represent audio samples or images as strings:	246	# These represent audio samples or images as strings:
243		247
244	#audioop audioop.c # Operations on audio samples	248	audioop audioop.c # Operations on audio samples
245	#imageop imageop.c # Operations on images	249	imageop imageop.c # Operations on images
246		250
247		251
248	# Note that the _md5 and _sha modules are normally only built if the	252	# Note that the _md5 and _sha modules are normally only built if the
Lines 252-265 Link Here
252	# Message-Digest Algorithm, described in RFC 1321. The necessary files	256	# Message-Digest Algorithm, described in RFC 1321. The necessary files
253	# md5.c and md5.h are included here.	257	# md5.c and md5.h are included here.
254		258
255	#_md5 md5module.c md5.c	259	_md5 md5module.c md5.c
256		260
257		261
258	# The _sha module implements the SHA checksum algorithms.	262	# The _sha module implements the SHA checksum algorithms.
259	# (NIST's Secure Hash Algorithms.)	263	# (NIST's Secure Hash Algorithms.)
260	#_sha shamodule.c	264	_sha shamodule.c
261	#_sha256 sha256module.c	265	_sha256 sha256module.c
262	#_sha512 sha512module.c	266	_sha512 sha512module.c
263		267
264		268
265	# SGI IRIX specific modules -- off by default.	269	# SGI IRIX specific modules -- off by default.
Lines 311-317 Link Here
311		315
312	# George Neville-Neil's timing module:	316	# George Neville-Neil's timing module:
313		317
314	#timing timingmodule.c	318	timing timingmodule.c
315		319
316		320
317	# The _tkinter module.	321	# The _tkinter module.
Lines 358-364 Link Here
358	# -lX11	362	# -lX11
359		363
360	# Lance Ellinghaus's syslog module	364	# Lance Ellinghaus's syslog module
361	#syslog syslogmodule.c # syslog daemon interface	365	syslog syslogmodule.c # syslog daemon interface
362		366
363		367
364	# Curses support, requring the System V version of curses, often	368	# Curses support, requring the System V version of curses, often
Lines 367-375 Link Here
367	#	371	#
368	# First, look at Setup.config; configure may have set this for you.	372	# First, look at Setup.config; configure may have set this for you.
369		373
370	#_curses _cursesmodule.c -lcurses -ltermcap	374	_curses _cursesmodule.c -lncurses
371	# Wrapper for the panel library that's part of ncurses and SYSV curses.	375	# Wrapper for the panel library that's part of ncurses and SYSV curses.
372	#_curses_panel _curses_panel.c -lpanel -lncurses	376	_curses_panel _curses_panel.c -lpanel -lncurses
373		377
374		378
375	# Generic (SunOS / SVR4) dynamic loading module.	379	# Generic (SunOS / SVR4) dynamic loading module.
Lines 434-447 Link Here
434		438
435		439
436	# Helper module for various ascii-encoders	440	# Helper module for various ascii-encoders
437	#binascii binascii.c	441	binascii binascii.c
438		442
439	# Fred Drake's interface to the Python parser	443	# Fred Drake's interface to the Python parser
440	#parser parsermodule.c	444	parser parsermodule.c
441		445
442	# cStringIO and cPickle	446	# cStringIO and cPickle
443	#cStringIO cStringIO.c	447	cStringIO cStringIO.c
444	#cPickle cPickle.c	448	cPickle cPickle.c
445		449
446		450
447	# Lee Busby's SIGFPE modules.	451	# Lee Busby's SIGFPE modules.
Lines 477-499 Link Here
477	#	481	#
478	# More information on Expat can be found at www.libexpat.org.	482	# More information on Expat can be found at www.libexpat.org.
479	#	483	#
480	#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI	484	pyexpat pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI -lexpat
481		485
482		486
483	# Hye-Shik Chang's CJKCodecs	487	# Hye-Shik Chang's CJKCodecs
484		488
485	# multibytecodec is required for all the other CJK codec modules	489	# multibytecodec is required for all the other CJK codec modules
486	#_multibytecodec cjkcodecs/multibytecodec.c	490	_multibytecodec cjkcodecs/multibytecodec.c
487		491
488	#_codecs_cn cjkcodecs/_codecs_cn.c	492	_codecs_cn cjkcodecs/_codecs_cn.c
489	#_codecs_hk cjkcodecs/_codecs_hk.c	493	_codecs_hk cjkcodecs/_codecs_hk.c
490	#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c	494	_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
491	#_codecs_jp cjkcodecs/_codecs_jp.c	495	_codecs_jp cjkcodecs/_codecs_jp.c
492	#_codecs_kr cjkcodecs/_codecs_kr.c	496	_codecs_kr cjkcodecs/_codecs_kr.c
493	#_codecs_tw cjkcodecs/_codecs_tw.c	497	_codecs_tw cjkcodecs/_codecs_tw.c
494		498
495	# Example -- included for reference only:	499	# Example -- included for reference only:
496	# xx xxmodule.c	500	# xx xxmodule.c
497		501
498	# Another example -- the 'xxsubtype' module shows C-level subtyping in action	502	# Another example -- the 'xxsubtype' module shows C-level subtyping in action
499	xxsubtype xxsubtype.c	503	xxsubtype xxsubtype.c
		504
		505	datetime datetimemodule.c
		506	bz2 bz2module.c -lbz2
		507	zlib zlibmodule.c -lz
		508	posix posixmodule.c
		509	_io _io/_iomodule.c _io/stringio.c _io/fileio.c _io/textio.c _io/bytesio.c _io/bufferedio.c _io/iobase.c
		510	_json _json.c
		511	future_builtins future_builtins.c
		512	_lsprof _lsprof.c rotatingtree.c
		513	_hashlib _hashopenssl.c
		514	_hotshot _hotshot.c
		515	_multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/socket_connection.c
		516	SQLITE3DEFS=-DSQLITE_OMIT_LOAD_EXTENSION=1
		517	SQLITE3MOD=-DMODULE_NAME='"sqlite3"'
		518	_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

Lines 8-14 Link Here

(-)a/Modules/_testcapimodule.c (+10 lines)
8	#include "Python.h"	8	#include "Python.h"
9	#include <float.h>	9	#include <float.h>
10	#include "structmember.h"	10	#include "structmember.h"
		11
		12	/* Differentiate between building the core module and building extension
		13	* modules.
		14	*/
		15	#ifdef Py_BUILD_CORE
		16	#undef Py_BUILD_CORE
		17	#include "datetime.h"
		18	#define Py_BUILD_CORE
		19	#else
11	#include "datetime.h"	20	#include "datetime.h"
		21	#endif
12		22
13	#ifdef WITH_THREAD	23	#ifdef WITH_THREAD
14	#include "pythread.h"	24	#include "pythread.h"