forked from amazingfate/loongoffice
8a6c5b2fcb
The module builds here on Fedora 17 and with MSVC2008.
MacOS X is unfinished and probably breaks, which is why the module
is disabled now.
These patches from module python were dropped:
Integrated upstream:
- Python.mipsel-py4305.patch
- Python-2.6.1-py4768.patch
- Python-2.6.1-py2422.patch (modified, use --with-valgrind)
- Python-2.6.1-urllib.patch
- Python-2.6.1-py8067.patch
Obsolete:
- Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now)
- Python-parallel-make.patch
- Python-2.6.1-nohardlink.patch (no idea why that would be needed,
NFS should support hard links)
- Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch)
- Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal)
- Python-2.6.2-bdb48.patch
- Python-2.6.1-vc10.patch (upstream supports vc10)
An attempt to cross compile with mingw that proved unsucessful according
to dtardon; there is upstream work on this topic that is possibly
already in 3.3: http://bugs.python.org/issue8067
- Python-2.6.2-cross.patch
- Python-2.6.2-cross.fix-configure.patch
Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
81 lines
2.6 KiB
Groff
81 lines
2.6 KiB
Groff
FreeBSD porting fixes, patch by maho@openoffice.org
|
|
|
|
--- misc/Python-2.6.1/Lib/test/test_threading.py 2008-09-30 22:41:13.000000000 +0200
|
|
+++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2011-06-06 17:31:17.000000000 +0200
|
|
@@ -382,7 +382,7 @@
|
|
# #12316 and #11870), and fork() from a worker thread is known to trigger
|
|
# problems with some operating systems (issue #3863): skip problematic tests
|
|
# on platforms known to behave badly.
|
|
- platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
|
|
+ platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'netbsd5',
|
|
'os2emx')
|
|
|
|
def _run_and_join(self, script):
|
|
--- misc/Python-2.6.1/Python/thread_pthread.h 2006-06-13 17:04:24.000000000 +0200
|
|
+++ misc/build/Python-2.6.1/Python/thread_pthread.h 2011-06-06 17:33:34.000000000 +0200
|
|
@@ -26,6 +26,10 @@
|
|
#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. */
|
|
@@ -44,7 +48,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 +152,9 @@
|
|
{
|
|
pthread_t th;
|
|
int status;
|
|
+#ifdef __FreeBSD__
|
|
+ sigset_t set, oset;
|
|
+#endif
|
|
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
|
pthread_attr_t attrs;
|
|
#endif
|
|
@@ -177,7 +183,10 @@
|
|
#if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
|
pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
|
|
#endif
|
|
-
|
|
+#ifdef __FreeBSD__
|
|
+ sigfillset(&set);
|
|
+ SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
|
|
+#endif
|
|
status = pthread_create(&th,
|
|
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
|
&attrs,
|
|
@@ -188,6 +197,9 @@
|
|
(void *)arg
|
|
);
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
|
|
+#endif
|
|
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
|
pthread_attr_destroy(&attrs);
|
|
#endif
|
|
--- misc/Python-2.6.1/configure 2008-11-16 18:57:10.000000000 +0100
|
|
+++ misc/build/Python-2.6.1/configure 2011-06-06 17:31:17.000000000 +0200
|
|
@@ -4110,11 +4110,6 @@
|
|
LDLIBRARY='libpython$(VERSION).so'
|
|
BLDLIBRARY='-L. -lpython$(VERSION)'
|
|
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
|
|
- case $ac_sys_system in
|
|
- FreeBSD*)
|
|
- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
|
|
- ;;
|
|
- esac
|
|
INSTSONAME="$LDLIBRARY".$SOVERSION
|
|
;;
|
|
hp*|HP*)
|