diff options
Diffstat (limited to 'lang/python27/files')
-rw-r--r-- | lang/python27/files/extra-patch-configure-pth | 12 | ||||
-rw-r--r-- | lang/python27/files/extra-patch-setup.py | 26 | ||||
-rw-r--r-- | lang/python27/files/patch-Lib_test_test_threading.py | 11 | ||||
-rw-r--r-- | lang/python27/files/patch-Modules-_ctypes-libffi-configure | 11 | ||||
-rw-r--r-- | lang/python27/files/patch-Python2.6-Lib_local.py | 11 | ||||
-rw-r--r-- | lang/python27/files/patch-Python_thread__pthread.h | 55 | ||||
-rw-r--r-- | lang/python27/files/patch-setup.py | 101 | ||||
-rw-r--r-- | lang/python27/files/pkg-message.in | 18 |
8 files changed, 0 insertions, 245 deletions
diff --git a/lang/python27/files/extra-patch-configure-pth b/lang/python27/files/extra-patch-configure-pth deleted file mode 100644 index dca00011cac4..000000000000 --- a/lang/python27/files/extra-patch-configure-pth +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.orig 2009-03-12 14:16:24.000000000 +0000 -+++ configure 2009-03-12 14:17:16.000000000 +0000 -@@ -5230,6 +5230,9 @@ - CC="$ac_save_cc" - fi - -+# XXX Explicitly disable system pthread libraries. -+ac_cv_pthread=no -+ - { echo "$as_me:$LINENO: result: $ac_cv_pthread" >&5 - echo "${ECHO_T}$ac_cv_pthread" >&6; } - fi diff --git a/lang/python27/files/extra-patch-setup.py b/lang/python27/files/extra-patch-setup.py deleted file mode 100644 index 77dc467db500..000000000000 --- a/lang/python27/files/extra-patch-setup.py +++ /dev/null @@ -1,26 +0,0 @@ ---- setup.py.1 2009-03-12 04:07:36.000000000 +0000 -+++ setup.py 2009-03-12 04:08:36.000000000 +0000 -@@ -1265,13 +1265,21 @@ - ) - libraries = [] - -- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'): -+ elif platform in ('freebsd4', 'freebsd5', 'freebsd6'): - # FreeBSD's P1003.1b semaphore support is very experimental - # and has many known problems. (as of June 2008) -- macros = dict( # FreeBSD -+ macros = dict( # FreeBSD 4-6 - HAVE_SEM_OPEN=0, - HAVE_SEM_TIMEDWAIT=0, - HAVE_FD_TRANSFER=1, -+ ) -+ libraries = [] -+ -+ elif platform in ('freebsd7', 'freebsd8', 'freebsd9'): -+ macros = dict( # FreeBSD 7+ -+ HAVE_SEM_OPEN=1, -+ HAVE_SEM_TIMEDWAIT=1, -+ HAVE_FD_TRANSFER=1, - ) - libraries = [] - diff --git a/lang/python27/files/patch-Lib_test_test_threading.py b/lang/python27/files/patch-Lib_test_test_threading.py deleted file mode 100644 index c7dec6dd9b87..000000000000 --- a/lang/python27/files/patch-Lib_test_test_threading.py +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000 -+++ Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000 -@@ -382,7 +382,7 @@ - return - # Skip platforms with known problems forking from a worker thread. - # See http://bugs.python.org/issue3863. -- if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'os2emx'): -+ if sys.platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'os2emx'): - print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread' - ' due to known OS bugs on'), sys.platform - return diff --git a/lang/python27/files/patch-Modules-_ctypes-libffi-configure b/lang/python27/files/patch-Modules-_ctypes-libffi-configure deleted file mode 100644 index c788e1813719..000000000000 --- a/lang/python27/files/patch-Modules-_ctypes-libffi-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/_ctypes/libffi/configure.orig 2008-05-24 00:06:50.000000000 +0900 -+++ Modules/_ctypes/libffi/configure 2008-10-09 20:24:02.000000000 +0900 -@@ -4725,7 +4725,7 @@ - rm -rf conftest* - ;; - --x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ - s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext diff --git a/lang/python27/files/patch-Python2.6-Lib_local.py b/lang/python27/files/patch-Python2.6-Lib_local.py deleted file mode 100644 index 63e722f38839..000000000000 --- a/lang/python27/files/patch-Python2.6-Lib_local.py +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/locale.py.foo 2009-05-11 22:57:00.000000000 +0200 -+++ Lib/locale.py 2009-05-11 22:57:23.000000000 +0200 -@@ -601,7 +601,7 @@ - 'tactis': 'TACTIS', - 'euc_jp': 'eucJP', - 'euc_kr': 'eucKR', -- 'utf_8': 'UTF8', -+ 'utf_8': 'UTF-8', - 'koi8_r': 'KOI8-R', - 'koi8_u': 'KOI8-U', - # XXX This list is still incomplete. If you know more diff --git a/lang/python27/files/patch-Python_thread__pthread.h b/lang/python27/files/patch-Python_thread__pthread.h deleted file mode 100644 index cde868cd8826..000000000000 --- a/lang/python27/files/patch-Python_thread__pthread.h +++ /dev/null @@ -1,55 +0,0 @@ ---- Python/thread_pthread.h.orig 2006-06-13 16:04:24.000000000 +0100 -+++ Python/thread_pthread.h 2009-03-12 10:55:49.000000000 +0000 -@@ -26,13 +26,18 @@ - #endif - #endif - -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+#endif -+ - /* The POSIX spec says that implementations supporting the sem_* - family of functions must indicate this by defining - _POSIX_SEMAPHORES. */ - #ifdef _POSIX_SEMAPHORES - /* On FreeBSD 4.x, _POSIX_SEMAPHORES is defined empty, so - we need to add 0 to make it work there as well. */ --#if (_POSIX_SEMAPHORES+0) == -1 -+#if defined(__FreeBSD__) && __FreeBSD_version < 701104 && \ -+ (_POSIX_SEMAPHORES+0) == -1 - #define HAVE_BROKEN_POSIX_SEMAPHORES - #else - #include <semaphore.h> -@@ -44,7 +49,6 @@ - in default setting. So the process scope is preferred to get - enough number of threads to work. */ - #ifdef __FreeBSD__ --#include <osreldate.h> - #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101 - #undef PTHREAD_SYSTEM_SCHED_SUPPORTED - #endif -@@ -149,6 +153,7 @@ - { - pthread_t th; - int status; -+ sigset_t set, oset; - #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) - pthread_attr_t attrs; - #endif -@@ -177,6 +182,8 @@ - #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) - pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM); - #endif -+ sigfillset(&set); -+ SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset); - - status = pthread_create(&th, - #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) -@@ -188,6 +195,7 @@ - (void *)arg - ); - -+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL); - #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) - pthread_attr_destroy(&attrs); - #endif diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py deleted file mode 100644 index c7825e0f1872..000000000000 --- a/lang/python27/files/patch-setup.py +++ /dev/null @@ -1,101 +0,0 @@ ---- setup.py.orig 2009-03-31 18:20:48.000000000 +0000 -+++ setup.py 2009-09-10 05:27:01.000000000 +0000 -@@ -17,7 +17,7 @@ from distutils.command.install import in - from distutils.command.install_lib import install_lib - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_sqlite3", "_tkinter", "gdbm", "mpz"] - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -577,7 +577,7 @@ class PyBuildExt(build_ext): - - readline_libs = ['readline'] - if self.compiler.find_library_file(lib_dirs, -- 'ncursesw'): -+ 'xxxncursesw'): - readline_libs.append('ncursesw') - elif self.compiler.find_library_file(lib_dirs, - 'ncurses'): -@@ -589,7 +589,7 @@ class PyBuildExt(build_ext): - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib', '/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: -@@ -689,6 +689,8 @@ class PyBuildExt(build_ext): - # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash - exts.append( Extension('_sha256', ['sha256module.c']) ) - exts.append( Extension('_sha512', ['sha512module.c']) ) -+ else: -+ open('.without_own_sha', 'w') - - # Modules that provide persistent dictionary-like semantics. You will - # probably want to arrange for at least one of them to be available on -@@ -990,7 +992,7 @@ class PyBuildExt(build_ext): - # the more recent berkeleydb's db.h file first in the include path - # when attempting to compile and it will fail. - f = "/usr/include/db.h" -- if os.path.exists(f) and not db_incs: -+ if os.path.exists(f): - data = open(f).read() - m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) - if m is not None: -@@ -1080,7 +1082,7 @@ class PyBuildExt(build_ext): - # Curses support, requiring the System V version of curses, often - # provided by the ncurses library. - panel_library = 'panel' -- if (self.compiler.find_library_file(lib_dirs, 'ncursesw')): -+ if (self.compiler.find_library_file(lib_dirs, 'xxxncursesw')): - curses_libs = ['ncursesw'] - # Bug 1464056: If _curses.so links with ncursesw, - # _curses_panel.so must link with panelw. -@@ -1090,6 +1092,7 @@ class PyBuildExt(build_ext): - elif (self.compiler.find_library_file(lib_dirs, 'ncurses')): - curses_libs = ['ncurses'] - exts.append( Extension('_curses', ['_cursesmodule.c'], -+ library_dirs = ['/usr/lib'], - libraries = curses_libs) ) - elif (self.compiler.find_library_file(lib_dirs, 'curses') - and platform != 'darwin'): -@@ -1111,6 +1114,7 @@ class PyBuildExt(build_ext): - if (module_enabled(exts, '_curses') and - self.compiler.find_library_file(lib_dirs, panel_library)): - exts.append( Extension('_curses_panel', ['_curses_panel.c'], -+ library_dirs = ['/usr/lib'], - libraries = [panel_library] + curses_libs) ) - else: - missing.append('_curses_panel') -@@ -1273,7 +1277,7 @@ class PyBuildExt(build_ext): - ) - libraries = [] - -- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): -+ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'): - # FreeBSD's P1003.1b semaphore support is very experimental - # and has many known problems. (as of June 2008) - macros = dict( # FreeBSD -@@ -1338,7 +1342,7 @@ class PyBuildExt(build_ext): - missing.append('linuxaudiodev') - - if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', -- 'freebsd7', 'freebsd8'): -+ 'freebsd7', 'freebsd8', 'freebsd9'): - exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) - else: - missing.append('ossaudiodev') -@@ -1891,9 +1895,7 @@ def main(): - ext_modules=[Extension('_struct', ['_struct.c'])], - - # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', -- 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = [] - ) - - # --install-platlib diff --git a/lang/python27/files/pkg-message.in b/lang/python27/files/pkg-message.in deleted file mode 100644 index 7f65e4d4ea80..000000000000 --- a/lang/python27/files/pkg-message.in +++ /dev/null @@ -1,18 +0,0 @@ -==== -Note that some of the standard modules are provided as separate -ports since they require extra dependencies: - -bsddb databases/py-bsddb -gdbm databases/py-gdbm -sqlite3 databases/py-sqlite3 -tkinter x11-toolkits/py-tkinter - -Install them as needed. -==== -%%SEM%%-------------------------------------------------------- -%%SEM%%This package was built with the experimental POSIX -%%SEM%%semaphore support. Please ensure that the kernel on the -%%SEM%%system where you deploy this package is either compiled -%%SEM%%with 'option P1003_1B_SEMAPHORES', or has the sem.ko -%%SEM%%kernel module loaded. -%%SEM%%-------------------------------------------------------- |