[Libreoffice-commits] .: python3/i100492-freebsd.patch.1 python3/i100492-freebsd.patch.2 python3/python-3.3.0-aix.patch.1 python3/UnpackedTarball_python3.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 28 01:18:30 PST 2012
python3/UnpackedTarball_python3.mk | 2
python3/i100492-freebsd.patch.1 | 80 +++++++++++++++++++++++++++++++++++++
python3/i100492-freebsd.patch.2 | 80 -------------------------------------
python3/python-3.3.0-aix.patch.1 | 29 +++++--------
4 files changed, 93 insertions(+), 98 deletions(-)
New commits:
commit d860b4f45144636c36bfd5b6f9f1b2a14ce36333
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 28 09:04:52 2012 +0000
defuzz patches to squeak by RHEL-5 patch
Change-Id: Iac990e65e3af852a527e67154c66e8ad39ce4767
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
index 5f30420..840108b 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
))
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
- python3/i100492-freebsd.patch.2 \
+ python3/i100492-freebsd.patch.1 \
python3/python-3.3.0-i42553.patch.2 \
python3/python-3.3.0-aix.patch.1 \
python3/python-3.3.0-darwin.patch.1 \
diff --git a/python3/i100492-freebsd.patch.1 b/python3/i100492-freebsd.patch.1
new file mode 100644
index 0000000..d797ac1
--- /dev/null
+++ b/python3/i100492-freebsd.patch.1
@@ -0,0 +1,80 @@
+FreeBSD porting fixes, patch by maho at openoffice.org
+
+--- Python-3.3.0/configure 2012-11-28 09:00:41.094955090 +0000
++++ Python-3.3.0/configure 2012-11-28 09:01:13.033329526 +0000
+@@ -5545,11 +5545,6 @@
+ LDLIBRARY='libpython$(LDVERSION).so'
+ BLDLIBRARY='-L. -lpython$(LDVERSION)'
+ 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
+ if test "$with_pydebug" != yes
+ then
+--- Python-3.3.0/Lib/test/test_threading.py 2012-11-28 09:00:41.292957412 +0000
++++ Python-3.3.0/Lib/test/test_threading.py 2012-11-28 09:01:13.017329339 +0000
+@@ -451,7 +451,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):
+--- Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:00:41.097955124 +0000
++++ Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:01:13.018329351 +0000
+@@ -42,6 +42,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. */
+@@ -60,7 +64,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
+@@ -186,6 +189,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
+@@ -214,7 +220,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,
+@@ -225,6 +234,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
diff --git a/python3/i100492-freebsd.patch.2 b/python3/i100492-freebsd.patch.2
deleted file mode 100644
index 19db3db..0000000
--- a/python3/i100492-freebsd.patch.2
+++ /dev/null
@@ -1,80 +0,0 @@
-FreeBSD porting fixes, patch by maho at 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*)
diff --git a/python3/python-3.3.0-aix.patch.1 b/python3/python-3.3.0-aix.patch.1
index 151e20e..1a24531 100644
--- a/python3/python-3.3.0-aix.patch.1
+++ b/python3/python-3.3.0-aix.patch.1
@@ -1,8 +1,7 @@
build with GCC on AIX
-diff -ru python3.old_/configure python3/configure
---- python3.old_/configure 2012-09-29 10:00:50.000000000 +0200
-+++ python3/configure 2012-11-13 19:28:25.869753237 +0100
+--- Python-3.3.0/configure 2012-11-28 09:05:45.990529603 +0000
++++ Python-3.3.0/configure 2012-11-28 09:06:23.037963934 +0000
@@ -3426,8 +3426,6 @@
else
@@ -34,7 +33,7 @@ diff -ru python3.old_/configure python3/configure
INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes
then
-@@ -6174,7 +6180,7 @@
+@@ -6169,7 +6175,7 @@
# debug builds.
OPT="-g -O0 -Wall $STRICT_PROTO"
else
@@ -43,7 +42,7 @@ diff -ru python3.old_/configure python3/configure
fi
;;
*)
-@@ -8306,8 +8312,13 @@
+@@ -8301,8 +8307,13 @@
then
case $ac_sys_system/$ac_sys_release in
AIX*)
@@ -59,9 +58,8 @@ diff -ru python3.old_/configure python3/configure
;;
IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
-diff -ru python3.old_/configure.ac python3/configure.ac
---- python3.old_/configure.ac 2012-09-29 10:00:50.000000000 +0200
-+++ python3/configure.ac 2012-11-13 19:28:36.273753536 +0100
+--- Python-3.3.0/configure.ac 2012-11-28 09:05:45.990529603 +0000
++++ Python-3.3.0/configure.ac 2012-11-28 09:06:23.038963946 +0000
@@ -545,8 +545,6 @@
without_gcc=$withval;;
esac], [
@@ -109,9 +107,8 @@ diff -ru python3.old_/configure.ac python3/configure.ac
;;
IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
-diff -ru python3.old_/Makefile.pre.in python3/Makefile.pre.in
---- python3.old_/Makefile.pre.in 2012-09-29 10:00:41.000000000 +0200
-+++ python3/Makefile.pre.in 2012-11-13 19:10:10.733742599 +0100
+--- Python-3.3.0/Makefile.pre.in 2012-11-28 09:05:45.861528086 +0000
++++ Python-3.3.0/Makefile.pre.in 2012-11-28 09:06:23.046964040 +0000
@@ -493,7 +493,10 @@
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
@@ -133,9 +130,8 @@ diff -ru python3.old_/Makefile.pre.in python3/Makefile.pre.in
export EXE; EXE="$(BUILDEXE)"; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
-diff -ru python3.old_/Modules/_ctypes/libffi/fficonfig.py.in python3/Modules/_ctypes/libffi/fficonfig.py.in
---- python3.old_/Modules/_ctypes/libffi/fficonfig.py.in 2012-09-29 10:00:42.000000000 +0200
-+++ python3/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-13 19:09:25.252740861 +0100
+--- Python-3.3.0/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-28 09:05:45.889528418 +0000
++++ Python-3.3.0/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-28 09:06:23.046964040 +0000
@@ -16,7 +16,7 @@
'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
@@ -145,9 +141,8 @@ diff -ru python3.old_/Modules/_ctypes/libffi/fficonfig.py.in python3/Modules/_ct
'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
-diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist
---- python3.old_/Modules/Setup.dist 2012-09-29 10:00:42.000000000 +0200
-+++ python3/Modules/Setup.dist 2012-11-13 19:09:25.251740860 +0100
+--- Python-3.3.0/Modules/Setup.dist 2012-11-28 09:05:45.935528957 +0000
++++ Python-3.3.0/Modules/Setup.dist 2012-11-28 09:06:23.052964111 +0000
@@ -177,7 +177,7 @@
#_bisect _bisectmodule.c # Bisection algorithms
#_heapq _heapqmodule.c # Heap queue algorithm
More information about the Libreoffice-commits
mailing list