[Python-checkins] r75692 - in sandbox/trunk/newgil: Doc/library/sys.rst Lib/distutils/archive_util.py Lib/distutils/command/build_ext.py Lib/distutils/tests/test_archive_util.py Lib/plat-atheos Lib/test/regrtest.py Lib/test/test_fcntl.py Lib/test/test_file.py Lib/test/test_fileio.py Lib/test/test_sys.py Misc/NEWS Python/dynload_atheos.c Python/thread.c Python/thread_atheos.h Tools/scripts/h2py.py configure configure.in setup.py
antoine.pitrou
python-checkins at python.org
Sun Oct 25 14:09:20 CET 2009
Author: antoine.pitrou
Date: Sun Oct 25 14:09:19 2009
New Revision: 75692
Log:
Merged revisions 75649,75652,75656,75661-75662,75665,75667-75668,75673,75676,75678,75680,75682,75684,75686-75687 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75649 | mark.dickinson | 2009年10月24日 13:49:04 +0200 (sam., 24 oct. 2009) | 9 lines
Recorded merge of revisions 75648 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75648 | mark.dickinson | 2009年10月24日 12:47:17 +0100 (2009年10月24日) | 1 line
Acknowledge Ned Deily (extensive bug hunting and testing on OS X)
........
................
r75652 | mark.dickinson | 2009年10月24日 14:15:17 +0200 (sam., 24 oct. 2009) | 12 lines
Blocked revisions 75651 via svnmerge
........
r75651 | mark.dickinson | 2009年10月24日 13:13:30 +0100 (2009年10月24日) | 7 lines
Issue #7117: Prepare for backport of py3k float repr.
Add the Python/dtoa.c file containing the main algorithms;
add corresponding include file and include in Python.h;
include license information for Python/dtoa.c;
add dtoa.c and dtoa.h to Makefile.
........
................
r75656 | antoine.pitrou | 2009年10月24日 14:31:03 +0200 (sam., 24 oct. 2009) | 16 lines
Blocked revisions 75650,75654-75655 via svnmerge
........
r75650 | antoine.pitrou | 2009年10月24日 13:59:41 +0200 (sam., 24 oct. 2009) | 3 lines
Manual py3k backport: [svn r74155] Issue #6242: Fix deallocator of io.StringIO and io.BytesIO
........
r75654 | antoine.pitrou | 2009年10月24日 14:23:18 +0200 (sam., 24 oct. 2009) | 3 lines
Manual py3k backport: [svn r74158] Issue #6218: Make io.BytesIO and io.StringIO picklable.
........
r75655 | antoine.pitrou | 2009年10月24日 14:28:22 +0200 (sam., 24 oct. 2009) | 3 lines
Manual py3k backport: [svn r74316] Issue #5449: Fix io.BytesIO to not accept arbitrary keywords
........
................
r75661 | mark.dickinson | 2009年10月24日 15:32:56 +0200 (sam., 24 oct. 2009) | 22 lines
Blocked revisions 75653,75658,75660 via svnmerge
........
r75653 | mark.dickinson | 2009年10月24日 13:17:24 +0100 (2009年10月24日) | 1 line
Temporary define to avoid build failure
........
r75658 | mark.dickinson | 2009年10月24日 14:28:38 +0100 (2009年10月24日) | 8 lines
Issue #7117 (backport py3k float repr) continued:
- add double endianness detection to configure script
- add configure-time check to see whether we can use inline
assembly to get and set x87 control word in configure script
- add functions to get and set x87 control word in Python/pymath.c
- add pyport.h logic to determine whether it's safe to use the
short float repr or not
........
r75660 | mark.dickinson | 2009年10月24日 14:31:41 +0100 (2009年10月24日) | 1 line
Remove temporary define from r75653
........
................
r75662 | tarek.ziade | 2009年10月24日 15:38:27 +0200 (sam., 24 oct. 2009) | 9 lines
Merged revisions 75659 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75659 | tarek.ziade | 2009年10月24日 15:29:44 +0200 (2009年10月24日) | 1 line
#7066 - Fixed distutils.archive_util.make_archive behavior so it restores the cwd
........
................
r75665 | mark.dickinson | 2009年10月24日 15:46:38 +0200 (sam., 24 oct. 2009) | 8 lines
Blocked revisions 75664 via svnmerge
........
r75664 | mark.dickinson | 2009年10月24日 14:44:16 +0100 (2009年10月24日) | 1 line
Configure check for double rounding should take BASECFLAGS into account
........
................
r75667 | mark.dickinson | 2009年10月24日 16:04:48 +0200 (sam., 24 oct. 2009) | 1 line
Add tests for sys.float_repr_style
................
r75668 | mark.dickinson | 2009年10月24日 16:05:34 +0200 (sam., 24 oct. 2009) | 10 lines
Blocked revisions 75666 via svnmerge
........
r75666 | mark.dickinson | 2009年10月24日 15:01:08 +0100 (2009年10月24日) | 4 lines
Issue #7117 (backport py3k float repr) continued:
Add sys.float_repr_style attribute ('short' if short float
repr is in used; 'legacy' otherwise).
........
................
r75673 | mark.dickinson | 2009年10月24日 17:56:07 +0200 (sam., 24 oct. 2009) | 10 lines
Blocked revisions 75672 via svnmerge
........
r75672 | mark.dickinson | 2009年10月24日 16:54:35 +0100 (2009年10月24日) | 4 lines
Issue #7117: temporarily disable the short float repr while the
pieces are being assembled. To re-enable, define the preprocessor
symbol PY_SHORT_FLOAT_REPR
........
................
r75676 | eric.smith | 2009年10月24日 21:52:23 +0200 (sam., 24 oct. 2009) | 8 lines
Blocked revisions 75675 via svnmerge
........
r75675 | eric.smith | 2009年10月24日 15:50:44 -0400 (2009年10月24日) | 1 line
Removed unused function PyFloat_AsStringEx. It is unused in floatobject.c, and it's not declared in any .h file.
........
................
r75678 | antoine.pitrou | 2009年10月24日 22:11:21 +0200 (sam., 24 oct. 2009) | 3 lines
Remove AtheOS support, as per PEP 11 (which claims that all code was removed in Python 3.0).
................
r75680 | antoine.pitrou | 2009年10月24日 22:24:16 +0200 (sam., 24 oct. 2009) | 3 lines
Disable support for Mach C Threads.
................
r75682 | antoine.pitrou | 2009年10月24日 22:30:34 +0200 (sam., 24 oct. 2009) | 3 lines
Disable support for SunOS LWP
................
r75684 | antoine.pitrou | 2009年10月24日 22:35:52 +0200 (sam., 24 oct. 2009) | 3 lines
Disable GNU pth support
................
r75686 | antoine.pitrou | 2009年10月24日 22:43:49 +0200 (sam., 24 oct. 2009) | 3 lines
Disable support for Irix threads
................
r75687 | antoine.pitrou | 2009年10月24日 22:47:05 +0200 (sam., 24 oct. 2009) | 3 lines
Add NEWS entry for the various unsupported platforms.
................
Removed:
sandbox/trunk/newgil/Lib/plat-atheos/
sandbox/trunk/newgil/Python/dynload_atheos.c
sandbox/trunk/newgil/Python/thread_atheos.h
Modified:
sandbox/trunk/newgil/ (props changed)
sandbox/trunk/newgil/Doc/library/sys.rst
sandbox/trunk/newgil/Lib/distutils/archive_util.py
sandbox/trunk/newgil/Lib/distutils/command/build_ext.py
sandbox/trunk/newgil/Lib/distutils/tests/test_archive_util.py
sandbox/trunk/newgil/Lib/test/regrtest.py
sandbox/trunk/newgil/Lib/test/test_fcntl.py
sandbox/trunk/newgil/Lib/test/test_file.py
sandbox/trunk/newgil/Lib/test/test_fileio.py
sandbox/trunk/newgil/Lib/test/test_sys.py
sandbox/trunk/newgil/Misc/NEWS
sandbox/trunk/newgil/Python/thread.c
sandbox/trunk/newgil/Tools/scripts/h2py.py
sandbox/trunk/newgil/configure
sandbox/trunk/newgil/configure.in
sandbox/trunk/newgil/setup.py
Modified: sandbox/trunk/newgil/Doc/library/sys.rst
==============================================================================
--- sandbox/trunk/newgil/Doc/library/sys.rst (original)
+++ sandbox/trunk/newgil/Doc/library/sys.rst Sun Oct 25 14:09:19 2009
@@ -576,7 +576,6 @@
Mac OS X ``'darwin'``
OS/2 ``'os2'``
OS/2 EMX ``'os2emx'``
- AtheOS ``'atheos'``
================ ===========================
Modified: sandbox/trunk/newgil/Lib/distutils/archive_util.py
==============================================================================
--- sandbox/trunk/newgil/Lib/distutils/archive_util.py (original)
+++ sandbox/trunk/newgil/Lib/distutils/archive_util.py Sun Oct 25 14:09:19 2009
@@ -232,10 +232,11 @@
kwargs['owner'] = owner
kwargs['group'] = group
- filename = func(base_name, base_dir, **kwargs)
-
- if root_dir is not None:
- log.debug("changing back to '%s'", save_cwd)
- os.chdir(save_cwd)
+ try:
+ filename = func(base_name, base_dir, **kwargs)
+ finally:
+ if root_dir is not None:
+ log.debug("changing back to '%s'", save_cwd)
+ os.chdir(save_cwd)
return filename
Modified: sandbox/trunk/newgil/Lib/distutils/command/build_ext.py
==============================================================================
--- sandbox/trunk/newgil/Lib/distutils/command/build_ext.py (original)
+++ sandbox/trunk/newgil/Lib/distutils/command/build_ext.py Sun Oct 25 14:09:19 2009
@@ -262,9 +262,9 @@
if os.name == 'os2':
self.library_dirs.append(os.path.join(sys.exec_prefix, 'Config'))
- # for extensions under Cygwin and AtheOS Python's library directory must be
+ # for extensions under Cygwin Python's library directory must be
# appended to library_dirs
- if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
+ if sys.platform[:6] == 'cygwin':
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
# building third party extensions
self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -776,22 +776,6 @@
# don't extend ext.libraries, it may be shared with other
# extensions, it is a reference to the original list
return ext.libraries + [pythonlib]
- elif sys.platform[:6] == "atheos":
- from distutils import sysconfig
-
- template = "python%d.%d"
- pythonlib = (template %
- (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
- # Get SHLIBS from Makefile
- extra = []
- for lib in sysconfig.get_config_var('SHLIBS').split():
- if lib.startswith('-l'):
- extra.append(lib[2:])
- else:
- extra.append(lib)
- # don't extend ext.libraries, it may be shared with other
- # extensions, it is a reference to the original list
- return ext.libraries + [pythonlib, "m"] + extra
elif sys.platform == 'darwin':
# Don't use the default code below
return ext.libraries
Modified: sandbox/trunk/newgil/Lib/distutils/tests/test_archive_util.py
==============================================================================
--- sandbox/trunk/newgil/Lib/distutils/tests/test_archive_util.py (original)
+++ sandbox/trunk/newgil/Lib/distutils/tests/test_archive_util.py Sun Oct 25 14:09:19 2009
@@ -8,7 +8,8 @@
import warnings
from distutils.archive_util import (check_archive_formats, make_tarball,
- make_zipfile, make_archive)
+ make_zipfile, make_archive,
+ ARCHIVE_FORMATS)
from distutils.spawn import find_executable, spawn
from distutils.tests import support
from test.support import check_warnings
@@ -262,6 +263,20 @@
finally:
archive.close()
+ def test_make_archive_cwd(self):
+ current_dir = os.getcwd()
+ def _breaks(*args, **kw):
+ raise RuntimeError()
+ ARCHIVE_FORMATS['xxx'] = (_breaks, [], 'xxx file')
+ try:
+ try:
+ make_archive('xxx', 'xxx', root_dir=self.mkdtemp())
+ except:
+ pass
+ self.assertEquals(os.getcwd(), current_dir)
+ finally:
+ del ARCHIVE_FORMATS['xxx']
+
def test_suite():
return unittest.makeSuite(ArchiveUtilTestCase)
Modified: sandbox/trunk/newgil/Lib/test/regrtest.py
==============================================================================
--- sandbox/trunk/newgil/Lib/test/regrtest.py (original)
+++ sandbox/trunk/newgil/Lib/test/regrtest.py Sun Oct 25 14:09:19 2009
@@ -1188,19 +1188,6 @@
test_zipfile
test_zlib
""",
- 'atheos':
- """
- test_curses
- test_dbm_gnu
- test_epoll
- test_largefile
- test_locale
- test_kqueue
- test_mhlib
- test_mmap
- test_poll
- test_resource
- """,
'cygwin':
"""
test_curses
Modified: sandbox/trunk/newgil/Lib/test/test_fcntl.py
==============================================================================
--- sandbox/trunk/newgil/Lib/test/test_fcntl.py (original)
+++ sandbox/trunk/newgil/Lib/test/test_fcntl.py Sun Oct 25 14:09:19 2009
@@ -16,15 +16,12 @@
# TODO - Write tests for flock() and lockf().
def get_lockdata():
- if sys.platform.startswith('atheos'):
- start_len = "qq"
+ try:
+ os.O_LARGEFILE
+ except AttributeError:
+ start_len = "ll"
else:
- try:
- os.O_LARGEFILE
- except AttributeError:
- start_len = "ll"
- else:
- start_len = "qq"
+ start_len = "qq"
if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
'Darwin1.2', 'darwin',
Modified: sandbox/trunk/newgil/Lib/test/test_file.py
==============================================================================
--- sandbox/trunk/newgil/Lib/test/test_file.py (original)
+++ sandbox/trunk/newgil/Lib/test/test_file.py Sun Oct 25 14:09:19 2009
@@ -106,8 +106,7 @@
('writelines', ([],)),
('__iter__', ()),
]
- if not sys.platform.startswith('atheos'):
- methods.append(('truncate', ()))
+ methods.append(('truncate', ()))
# __exit__ should close the file
self.f.__exit__(None, None, None)
Modified: sandbox/trunk/newgil/Lib/test/test_fileio.py
==============================================================================
--- sandbox/trunk/newgil/Lib/test/test_fileio.py (original)
+++ sandbox/trunk/newgil/Lib/test/test_fileio.py Sun Oct 25 14:09:19 2009
@@ -96,8 +96,6 @@
methods = ['fileno', 'isatty', 'read', 'readinto',
'seek', 'tell', 'truncate', 'write', 'seekable',
'readable', 'writable']
- if sys.platform.startswith('atheos'):
- methods.remove('truncate')
self.f.close()
self.assertTrue(self.f.closed)
Modified: sandbox/trunk/newgil/Lib/test/test_sys.py
==============================================================================
--- sandbox/trunk/newgil/Lib/test/test_sys.py (original)
+++ sandbox/trunk/newgil/Lib/test/test_sys.py Sun Oct 25 14:09:19 2009
@@ -372,6 +372,8 @@
self.assertEqual(vi[3], vi.releaselevel)
self.assertEqual(vi[4], vi.serial)
self.assertTrue(vi > (1,0,0))
+ self.assertIsInstance(sys.float_repr_style, str)
+ self.assertTrue(sys.float_repr_style in ('short', 'legacy'))
def test_43581(self):
# Can't use sys.stdout, as this is a StringIO object when
Modified: sandbox/trunk/newgil/Misc/NEWS
==============================================================================
--- sandbox/trunk/newgil/Misc/NEWS (original)
+++ sandbox/trunk/newgil/Misc/NEWS Sun Oct 25 14:09:19 2009
@@ -12,6 +12,13 @@
Core and Builtins
-----------------
+- Support for AtheOS has been completely removed from the code base. It was
+ disabled since Python 3.0.
+
+- Support for several legacy threading libraries has been disabled. These
+ libraries are: Mach C threads, SunOS LWP, GNU pth, Irix threads. Support code
+ will be entirely removed in 3.3.
+
- Peephole constant folding had missed UNARY_POSITIVE.
- Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which
@@ -1143,6 +1150,9 @@
Library
-------
+- Issue #7066: archive_util.make_archive now restores the cwd if an error is
+ raised. Initial patch by Ezio Melotti.
+
- Issue #6516: Added owner/group support when creating tar archives in
Distutils.
Deleted: sandbox/trunk/newgil/Python/dynload_atheos.c
==============================================================================
--- sandbox/trunk/newgil/Python/dynload_atheos.c Sun Oct 25 14:09:19 2009
+++ (empty file)
@@ -1,47 +0,0 @@
-
-/* Support for dynamic loading of extension modules */
-
-#include <atheos/image.h>
-#include <errno.h>
-
-#include "Python.h"
-#include "importdl.h"
-
-
-const struct filedescr _PyImport_DynLoadFiletab[] = {
- {".so", "rb", C_EXTENSION},
- {"module.so", "rb", C_EXTENSION},
- {0, 0}
-};
-
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
- const char *pathname, FILE *fp)
-{
- void *p;
- int lib;
- char funcname[258];
-
- if (Py_VerboseFlag)
- printf("load_library %s\n", pathname);
-
- lib = load_library(pathname, 0);
- if (lib < 0) {
- char buf[512];
- if (Py_VerboseFlag)
- perror(pathname);
- PyOS_snprintf(buf, sizeof(buf), "Failed to load %.200s: %.200s",
- pathname, strerror(errno));
- PyErr_SetString(PyExc_ImportError, buf);
- return NULL;
- }
- PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname);
- if (Py_VerboseFlag)
- printf("get_symbol_address %s\n", funcname);
- if (get_symbol_address(lib, funcname, -1, &p) < 0) {
- p = NULL;
- if (Py_VerboseFlag)
- perror(funcname);
- }
-
- return (dl_funcptr) p;
-}
Modified: sandbox/trunk/newgil/Python/thread.c
==============================================================================
--- sandbox/trunk/newgil/Python/thread.c (original)
+++ sandbox/trunk/newgil/Python/thread.c Sun Oct 25 14:09:19 2009
@@ -23,12 +23,6 @@
#include <stdlib.h>
-#ifdef __sgi
-#ifndef HAVE_PTHREAD_H /* XXX Need to check in configure.in */
-#undef _POSIX_THREADS
-#endif
-#endif
-
#include "pythread.h"
#ifndef _POSIX_THREADS
@@ -101,6 +95,7 @@
static size_t _pythread_stacksize = 0;
#ifdef SGI_THREADS
+#error SGI Irix threads are now unsupported, and code will be removed in 3.3.
#include "thread_sgi.h"
#endif
@@ -109,10 +104,12 @@
#endif
#ifdef SUN_LWP
+#error SunOS lightweight processes are now unsupported, and code will be removed in 3.3.
#include "thread_lwp.h"
#endif
#ifdef HAVE_PTH
+#error GNU pth threads are now unsupported, and code will be removed in 3.3.
#include "thread_pth.h"
#undef _POSIX_THREADS
#endif
@@ -122,6 +119,7 @@
#endif
#ifdef C_THREADS
+#error Mach C Threads are now unsupported, and code will be removed in 3.3.
#include "thread_cthread.h"
#endif
@@ -137,10 +135,6 @@
#include "thread_plan9.h"
#endif
-#ifdef ATHEOS_THREADS
-#include "thread_atheos.h"
-#endif
-
/*
#ifdef FOOBAR_THREADS
#include "thread_foobar.h"
Deleted: sandbox/trunk/newgil/Python/thread_atheos.h
==============================================================================
--- sandbox/trunk/newgil/Python/thread_atheos.h Sun Oct 25 14:09:19 2009
+++ (empty file)
@@ -1,300 +0,0 @@
-/* Threading for AtheOS.
- Based on thread_beos.h. */
-
-#include <atheos/threads.h>
-#include <atheos/semaphore.h>
-#include <atheos/atomic.h>
-#include <errno.h>
-#include <string.h>
-
-/* Missing decl from threads.h */
-extern int exit_thread(int);
-
-
-/* Undefine FASTLOCK to play with simple semaphores. */
-#define FASTLOCK
-
-
-#ifdef FASTLOCK
-
-/* Use an atomic counter and a semaphore for maximum speed. */
-typedef struct fastmutex {
- sem_id sem;
- atomic_t count;
-} fastmutex_t;
-
-
-static int fastmutex_create(const char *name, fastmutex_t * mutex);
-static int fastmutex_destroy(fastmutex_t * mutex);
-static int fastmutex_lock(fastmutex_t * mutex);
-static int fastmutex_timedlock(fastmutex_t * mutex, bigtime_t timeout);
-static int fastmutex_unlock(fastmutex_t * mutex);
-
-
-static int fastmutex_create(const char *name, fastmutex_t * mutex)
-{
- mutex->count = 0;
- mutex->sem = create_semaphore(name, 0, 0);
- return (mutex->sem < 0) ? -1 : 0;
-}
-
-
-static int fastmutex_destroy(fastmutex_t * mutex)
-{
- if (fastmutex_timedlock(mutex, 0) == 0 || errno == EWOULDBLOCK) {
- return delete_semaphore(mutex->sem);
- }
- return 0;
-}
-
-
-static int fastmutex_lock(fastmutex_t * mutex)
-{
- atomic_t prev = atomic_add(&mutex->count, 1);
- if (prev > 0)
- return lock_semaphore(mutex->sem);
- return 0;
-}
-
-
-static int fastmutex_timedlock(fastmutex_t * mutex, bigtime_t timeout)
-{
- atomic_t prev = atomic_add(&mutex->count, 1);
- if (prev > 0)
- return lock_semaphore_x(mutex->sem, 1, 0, timeout);
- return 0;
-}
-
-
-static int fastmutex_unlock(fastmutex_t * mutex)
-{
- atomic_t prev = atomic_add(&mutex->count, -1);
- if (prev > 1)
- return unlock_semaphore(mutex->sem);
- return 0;
-}
-
-
-#endif /* FASTLOCK */
-
-
-/*
- * Initialization.
- *
- */
-static void PyThread__init_thread(void)
-{
- /* Do nothing. */
- return;
-}
-
-
-/*
- * Thread support.
- *
- */
-
-static atomic_t thread_count = 0;
-
-long PyThread_start_new_thread(void (*func) (void *), void *arg)
-{
- status_t success = -1;
- thread_id tid;
- char name[OS_NAME_LENGTH];
- atomic_t this_thread;
-
- dprintf(("PyThread_start_new_thread called\n"));
-
- this_thread = atomic_add(&thread_count, 1);
- PyOS_snprintf(name, sizeof(name), "python thread (%d)", this_thread);
-
- tid = spawn_thread(name, func, NORMAL_PRIORITY, 0, arg);
- if (tid < 0) {
- dprintf(("PyThread_start_new_thread spawn_thread failed: %s\n", strerror(errno)));
- } else {
- success = resume_thread(tid);
- if (success < 0) {
- dprintf(("PyThread_start_new_thread resume_thread failed: %s\n", strerror(errno)));
- }
- }
-
- return (success < 0 ? -1 : tid);
-}
-
-
-long PyThread_get_thread_ident(void)
-{
- return get_thread_id(NULL);
-}
-
-
-static void do_PyThread_exit_thread(int no_cleanup)
-{
- dprintf(("PyThread_exit_thread called\n"));
-
- /* Thread-safe way to read a variable without a mutex: */
- if (atomic_add(&thread_count, 0) == 0) {
- /* No threads around, so exit main(). */
- if (no_cleanup)
- _exit(0);
- else
- exit(0);
- } else {
- /* We're a thread */
- exit_thread(0);
- }
-}
-
-
-void PyThread_exit_thread(void)
-{
- do_PyThread_exit_thread(0);
-}
-
-
-void PyThread__exit_thread(void)
-{
- do_PyThread_exit_thread(1);
-}
-
-
-#ifndef NO_EXIT_PROG
-static void do_PyThread_exit_prog(int status, int no_cleanup)
-{
- dprintf(("PyThread_exit_prog(%d) called\n", status));
-
- /* No need to do anything, the threads get torn down if main()exits. */
- if (no_cleanup)
- _exit(status);
- else
- exit(status);
-}
-
-
-void PyThread_exit_prog(int status)
-{
- do_PyThread_exit_prog(status, 0);
-}
-
-
-void PyThread__exit_prog(int status)
-{
- do_PyThread_exit_prog(status, 1);
-}
-#endif /* NO_EXIT_PROG */
-
-
-/*
- * Lock support.
- *
- */
-
-static atomic_t lock_count = 0;
-
-PyThread_type_lock PyThread_allocate_lock(void)
-{
-#ifdef FASTLOCK
- fastmutex_t *lock;
-#else
- sem_id sema;
-#endif
- char name[OS_NAME_LENGTH];
- atomic_t this_lock;
-
- dprintf(("PyThread_allocate_lock called\n"));
-
-#ifdef FASTLOCK
- lock = (fastmutex_t *) malloc(sizeof(fastmutex_t));
- if (lock == NULL) {
- dprintf(("PyThread_allocate_lock failed: out of memory\n"));
- return (PyThread_type_lock) NULL;
- }
-#endif
- this_lock = atomic_add(&lock_count, 1);
- PyOS_snprintf(name, sizeof(name), "python lock (%d)", this_lock);
-
-#ifdef FASTLOCK
- if (fastmutex_create(name, lock) < 0) {
- dprintf(("PyThread_allocate_lock failed: %s\n",
- strerror(errno)));
- free(lock);
- lock = NULL;
- }
- dprintf(("PyThread_allocate_lock()-> %p\n", lock));
- return (PyThread_type_lock) lock;
-#else
- sema = create_semaphore(name, 1, 0);
- if (sema < 0) {
- dprintf(("PyThread_allocate_lock failed: %s\n",
- strerror(errno)));
- sema = 0;
- }
- dprintf(("PyThread_allocate_lock()-> %p\n", sema));
- return (PyThread_type_lock) sema;
-#endif
-}
-
-
-void PyThread_free_lock(PyThread_type_lock lock)
-{
- dprintf(("PyThread_free_lock(%p) called\n", lock));
-
-#ifdef FASTLOCK
- if (fastmutex_destroy((fastmutex_t *) lock) < 0) {
- dprintf(("PyThread_free_lock(%p) failed: %s\n", lock,
- strerror(errno)));
- }
- free(lock);
-#else
- if (delete_semaphore((sem_id) lock) < 0) {
- dprintf(("PyThread_free_lock(%p) failed: %s\n", lock,
- strerror(errno)));
- }
-#endif
-}
-
-
-int PyThread_acquire_lock(PyThread_type_lock lock, int waitflag)
-{
- int retval;
-
- dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock,
- waitflag));
-
-#ifdef FASTLOCK
- if (waitflag)
- retval = fastmutex_lock((fastmutex_t *) lock);
- else
- retval = fastmutex_timedlock((fastmutex_t *) lock, 0);
-#else
- if (waitflag)
- retval = lock_semaphore((sem_id) lock);
- else
- retval = lock_semaphore_x((sem_id) lock, 1, 0, 0);
-#endif
- if (retval < 0) {
- dprintf(("PyThread_acquire_lock(%p, %d) failed: %s\n",
- lock, waitflag, strerror(errno)));
- }
- dprintf(("PyThread_acquire_lock(%p, %d)-> %d\n", lock, waitflag,
- retval));
- return retval < 0 ? 0 : 1;
-}
-
-
-void PyThread_release_lock(PyThread_type_lock lock)
-{
- dprintf(("PyThread_release_lock(%p) called\n", lock));
-
-#ifdef FASTLOCK
- if (fastmutex_unlock((fastmutex_t *) lock) < 0) {
- dprintf(("PyThread_release_lock(%p) failed: %s\n", lock,
- strerror(errno)));
- }
-#else
- if (unlock_semaphore((sem_id) lock) < 0) {
- dprintf(("PyThread_release_lock(%p) failed: %s\n", lock,
- strerror(errno)));
- }
-#endif
-}
Modified: sandbox/trunk/newgil/Tools/scripts/h2py.py
==============================================================================
--- sandbox/trunk/newgil/Tools/scripts/h2py.py (original)
+++ sandbox/trunk/newgil/Tools/scripts/h2py.py Sun Oct 25 14:09:19 2009
@@ -49,13 +49,7 @@
try:
searchdirs=os.environ['INCLUDE'].split(';')
except KeyError:
- try:
- if sys.platform.startswith("atheos"):
- searchdirs=os.environ['C_INCLUDE_PATH'].split(':')
- else:
- raise KeyError
- except KeyError:
- searchdirs=['/usr/include']
+ searchdirs=['/usr/include']
def main():
global filedict
Modified: sandbox/trunk/newgil/configure
==============================================================================
--- sandbox/trunk/newgil/configure (original)
+++ sandbox/trunk/newgil/configure Sun Oct 25 14:09:19 2009
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 74745 .
+# From configure.in Revision: 75678 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@@ -1352,7 +1352,6 @@
disable/enable thread support
--with(out)-thread[=DIRECTORY]
deprecated; use --with(out)-threads
- --with-pth use GNU pth threading libraries
--with(out)-doc-strings disable/enable documentation strings
--with(out)-tsc enable/disable timestamp counter profile
--with(out)-pymalloc disable/enable specialized mallocs
@@ -2066,7 +2065,6 @@
case $MACHDEP in
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
- atheos*) MACHDEP="atheos";;
irix646) MACHDEP="irix6";;
'') MACHDEP="unknown";;
esac
@@ -3802,7 +3800,7 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
-rm -f -r conftest*
+rm -f conftest*
@@ -3972,7 +3970,7 @@
if test -z "$enable_shared"
then
case $ac_sys_system in
- CYGWIN* | atheos*)
+ CYGWIN*)
enable_shared="yes";;
*)
enable_shared="no";;
@@ -4108,11 +4106,6 @@
BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
;;
- atheos*)
- LDLIBRARY='libpython$(VERSION).so'
- BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- ;;
Darwin*)
LDLIBRARY='libpython$(VERSION).dylib'
BLDLIBRARY='-L. -lpython$(VERSION)'
@@ -4451,7 +4444,6 @@
if test -z "$LN" ; then
case $ac_sys_system in
CYGWIN*) LN="ln -s";;
- atheos*) LN="ln -s";;
*) LN=ln;;
esac
fi
@@ -5355,7 +5347,7 @@
else
ac_cv_header_stdc=no
fi
-rm -f -r conftest*
+rm -f conftest*
fi
@@ -5376,7 +5368,7 @@
else
ac_cv_header_stdc=no
fi
-rm -f -r conftest*
+rm -f conftest*
fi
@@ -6474,7 +6466,7 @@
fi
-rm -f -r conftest*
+rm -f conftest*
{ echo "$as_me:$LINENO: result: $was_it_defined" >&5
echo "${ECHO_T}$was_it_defined" >&6; }
@@ -7004,7 +6996,7 @@
else
ac_cv_type_uid_t=no
fi
-rm -f -r conftest*
+rm -f conftest*
fi
{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -14696,7 +14688,6 @@
fi;;
SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport';;
CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
- atheos*) LDSHARED="gcc -shared";;
*) LDSHARED="ld";;
esac
fi
@@ -14737,7 +14728,6 @@
*gcc*) CCSHARED="-shared";;
*) CCSHARED="";;
esac;;
- atheos*) CCSHARED="-fPIC";;
esac
fi
{ echo "$as_me:$LINENO: result: $CCSHARED" >&5
@@ -15548,7 +15538,7 @@
else
unistd_defines_pthreads=no
fi
-rm -f -r conftest*
+rm -f conftest*
{ echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -15852,28 +15842,6 @@
THREADOBJ="Python/thread.o"
else
- { echo "$as_me:$LINENO: checking for --with-pth" >&5
-echo $ECHO_N "checking for --with-pth... $ECHO_C" >&6; }
-
-# Check whether --with-pth was given.
-if test "${with_pth+set}" = set; then
- withval=$with_pth; { echo "$as_me:$LINENO: result: $withval" >&5
-echo "${ECHO_T}$withval" >&6; }
- cat >>confdefs.h <<\_ACEOF
-#define WITH_THREAD 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTH 1
-_ACEOF
-
- LIBS="-lpth $LIBS"
- THREADOBJ="Python/thread.o"
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
# Just looking for pthread_create in libpthread is not enough:
# on HP/UX, pthread.h renames pthread_create to a different symbol name.
# So we really have to include pthread.h, and then link.
@@ -16022,149 +15990,6 @@
THREADOBJ="Python/thread.o"
else
- if test "${ac_cv_header_atheos_threads_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for atheos/threads.h" >&5
-echo $ECHO_N "checking for atheos/threads.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_atheos_threads_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_atheos_threads_h" >&5
-echo "${ECHO_T}$ac_cv_header_atheos_threads_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking atheos/threads.h usability" >&5
-echo $ECHO_N "checking atheos/threads.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <atheos/threads.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking atheos/threads.h presence" >&5
-echo $ECHO_N "checking atheos/threads.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <atheos/threads.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: atheos/threads.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: atheos/threads.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: atheos/threads.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: atheos/threads.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: atheos/threads.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: atheos/threads.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: atheos/threads.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: atheos/threads.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: atheos/threads.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: atheos/threads.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: atheos/threads.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: atheos/threads.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: atheos/threads.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: atheos/threads.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: atheos/threads.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: atheos/threads.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## -------------------------------------- ##
-## Report this to http://bugs.python.org/ ##
-## -------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for atheos/threads.h" >&5
-echo $ECHO_N "checking for atheos/threads.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_atheos_threads_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_atheos_threads_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_atheos_threads_h" >&5
-echo "${ECHO_T}$ac_cv_header_atheos_threads_h" >&6; }
-
-fi
-if test $ac_cv_header_atheos_threads_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define WITH_THREAD 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ATHEOS_THREADS 1
-_ACEOF
-
- THREADOBJ="Python/thread.o"
-else
-
{ echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then
@@ -16461,17 +16286,12 @@
fi
-
-fi
-
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-fi
-
fi
@@ -17016,7 +16836,7 @@
$EGREP "yes" >/dev/null 2>&1; then
ipv6type=$i
fi
-rm -f -r conftest*
+rm -f conftest*
;;
kame)
@@ -17039,7 +16859,7 @@
ipv6libdir=/usr/local/v6/lib
ipv6trylibc=yes
fi
-rm -f -r conftest*
+rm -f conftest*
;;
linux-glibc)
@@ -17060,7 +16880,7 @@
ipv6type=$i;
ipv6trylibc=yes
fi
-rm -f -r conftest*
+rm -f conftest*
;;
linux-inet6)
@@ -17098,7 +16918,7 @@
ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib
fi
-rm -f -r conftest*
+rm -f conftest*
;;
v6d)
@@ -17121,7 +16941,7 @@
ipv6libdir=/usr/local/v6/lib;
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
fi
-rm -f -r conftest*
+rm -f conftest*
;;
zeta)
@@ -17143,7 +16963,7 @@
ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib
fi
-rm -f -r conftest*
+rm -f conftest*
;;
esac
@@ -17439,7 +17259,6 @@
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
# Use dynload_next.c only on 10.2 and below, which don't have native dlopen()
Darwin/[0156]\..*) DYNLOADFILE="dynload_next.o";;
- atheos*) DYNLOADFILE="dynload_atheos.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
# out any dynamic loading
@@ -25235,7 +25054,7 @@
_ACEOF
fi
-rm -f -r conftest*
+rm -f conftest*
fi
@@ -25505,7 +25324,7 @@
_ACEOF
fi
-rm -f -r conftest*
+rm -f conftest*
fi
Modified: sandbox/trunk/newgil/configure.in
==============================================================================
--- sandbox/trunk/newgil/configure.in (original)
+++ sandbox/trunk/newgil/configure.in Sun Oct 25 14:09:19 2009
@@ -248,7 +248,6 @@
case $MACHDEP in
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
- atheos*) MACHDEP="atheos";;
irix646) MACHDEP="irix6";;
'') MACHDEP="unknown";;
esac
@@ -630,7 +629,7 @@
if test -z "$enable_shared"
then
case $ac_sys_system in
- CYGWIN* | atheos*)
+ CYGWIN*)
enable_shared="yes";;
*)
enable_shared="no";;
@@ -716,11 +715,6 @@
BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
;;
- atheos*)
- LDLIBRARY='libpython$(VERSION).so'
- BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- ;;
Darwin*)
LDLIBRARY='libpython$(VERSION).dylib'
BLDLIBRARY='-L. -lpython$(VERSION)'
@@ -774,7 +768,6 @@
if test -z "$LN" ; then
case $ac_sys_system in
CYGWIN*) LN="ln -s";;
- atheos*) LN="ln -s";;
*) LN=ln;;
esac
fi
@@ -1701,7 +1694,6 @@
fi;;
SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport';;
CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
- atheos*) LDSHARED="gcc -shared";;
*) LDSHARED="ld";;
esac
fi
@@ -1740,7 +1732,6 @@
*gcc*) CCSHARED="-shared";;
*) CCSHARED="";;
esac;;
- atheos*) CCSHARED="-fPIC";;
esac
fi
AC_MSG_RESULT($CCSHARED)
@@ -2027,17 +2018,6 @@
AC_DEFINE(MACH_C_THREADS, 1,
[Define if you are using Mach cthreads under mach /])
THREADOBJ="Python/thread.o"],[
- AC_MSG_CHECKING(for --with-pth)
- AC_ARG_WITH([pth],
- AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
- [AC_MSG_RESULT($withval)
- AC_DEFINE([WITH_THREAD])
- AC_DEFINE([HAVE_PTH], 1,
- [Define if you have GNU PTH threads.])
- LIBS="-lpth $LIBS"
- THREADOBJ="Python/thread.o"],
- [AC_MSG_RESULT(no)
-
# Just looking for pthread_create in libpthread is not enough:
# on HP/UX, pthread.h renames pthread_create to a different symbol name.
# So we really have to include pthread.h, and then link.
@@ -2056,10 +2036,6 @@
AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
THREADOBJ="Python/thread.o"],[
- AC_CHECK_HEADER(atheos/threads.h, [AC_DEFINE(WITH_THREAD)
- AC_DEFINE(ATHEOS_THREADS, 1,
- [Define this if you have AtheOS threads.])
- THREADOBJ="Python/thread.o"],[
AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
posix_threads=yes
LIBS="$LIBS -lpthreads"
@@ -2077,7 +2053,7 @@
LIBS="$LIBS -lcma"
THREADOBJ="Python/thread.o"],[
USE_THREAD_MODULE="#"])
- ])])])])])])])])])
+ ])])])])])])])
AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
LIBS="$LIBS -lmpc"
@@ -2409,7 +2385,6 @@
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
# Use dynload_next.c only on 10.2 and below, which don't have native dlopen()
Darwin/@<:@0156@:>@\..*) DYNLOADFILE="dynload_next.o";;
- atheos*) DYNLOADFILE="dynload_atheos.o";;
*)
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
# out any dynamic loading
Modified: sandbox/trunk/newgil/setup.py
==============================================================================
--- sandbox/trunk/newgil/setup.py (original)
+++ sandbox/trunk/newgil/setup.py Sun Oct 25 14:09:19 2009
@@ -288,7 +288,7 @@
def get_platform(self):
# Get value of sys.platform
- for platform in ['cygwin', 'darwin', 'atheos', 'osf1']:
+ for platform in ['cygwin', 'darwin', 'osf1']:
if sys.platform.startswith(platform):
return platform
return sys.platform
@@ -355,13 +355,6 @@
platform = self.get_platform()
srcdir = sysconfig.get_config_var('srcdir')
- # Check for AtheOS which has libraries in non-standard locations
- if platform == 'atheos':
- lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
- inc_dirs += ['/system/include', '/atheos/autolnk/include']
- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if platform in ['osf1', 'unixware7', 'openunix8']:
lib_dirs += ['/usr/ccs/lib']
@@ -465,7 +458,7 @@
exts.append( Extension('parser', ['parsermodule.c']) )
# Memory-mapped files (also works on Win32).
- if platform not in ['atheos', 'mac']:
+ if platform not in ['mac']:
exts.append( Extension('mmap', ['mmapmodule.c']) )
else:
missing.append('mmap')
@@ -975,13 +968,10 @@
# Steen Lumholt's termios module
exts.append( Extension('termios', ['termios.c']) )
# Jeremy Hylton's rlimit interface
- if platform not in ['atheos']:
- exts.append( Extension('resource', ['resource.c']) )
- else:
- missing.append('resource')
+ exts.append( Extension('resource', ['resource.c']) )
# Sun yellow pages. Some systems have the functions in libc.
- if platform not in ['cygwin', 'atheos', 'qnx6']:
+ if platform not in ['cygwin', 'qnx6']:
if (self.compiler_obj.find_library_file(lib_dirs, 'nsl')):
libs = ['nsl']
else:
More information about the Python-checkins
mailing list