python-freebsd.patch (67da92c9) python-freebsd.patch (de1dbc42)
1--- misc/Python-2.7.4/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
2+++ misc/build/Python-2.7.4/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
1--- misc/Python-2.7.5/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
2+++ misc/build/Python-2.7.5/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
3@@ -0,0 +1,612 @@
4+# Generated by h2py from /usr/include/netinet/in.h
5+
6+# Included from sys/cdefs.h
7+__GNUCLIKE_ASM = 3
8+__GNUCLIKE_ASM = 2
9+__GNUCLIKE___TYPEOF = 1
10+__GNUCLIKE___OFFSETOF = 1

--- 597 unchanged lines hidden (view full) ---

608+IPV6CTL_ISATAPRTR = 43
609+IPV6CTL_MCAST_PMTU = 44
610+IPV6CTL_STEALTH = 45
611+ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47
612+IPV6CTL_NO_RADR = 48
613+IPV6CTL_NORBIT_RAIF = 49
614+IPV6CTL_RFC6204W3 = 50
615+IPV6CTL_MAXID = 51
3@@ -0,0 +1,612 @@
4+# Generated by h2py from /usr/include/netinet/in.h
5+
6+# Included from sys/cdefs.h
7+__GNUCLIKE_ASM = 3
8+__GNUCLIKE_ASM = 2
9+__GNUCLIKE___TYPEOF = 1
10+__GNUCLIKE___OFFSETOF = 1

--- 597 unchanged lines hidden (view full) ---

608+IPV6CTL_ISATAPRTR = 43
609+IPV6CTL_MCAST_PMTU = 44
610+IPV6CTL_STEALTH = 45
611+ICMPV6CTL_ND6_ONLINKNSRFC4861 = 47
612+IPV6CTL_NO_RADR = 48
613+IPV6CTL_NORBIT_RAIF = 49
614+IPV6CTL_RFC6204W3 = 50
615+IPV6CTL_MAXID = 51
616--- misc/Python-2.7.4/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
617+++ misc/build/Python-2.7.4/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
616--- misc/Python-2.7.5/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
617+++ misc/build/Python-2.7.5/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
618@@ -0,0 +1,3 @@
619+#! /bin/sh
620+set -v
621+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
618@@ -0,0 +1,3 @@
619+#! /bin/sh
620+set -v
621+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
622--- misc/Python-2.7.4/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
623+++ misc/build/Python-2.7.4/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
622--- misc/Python-2.7.5/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
623+++ misc/build/Python-2.7.5/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
624@@ -421,7 +421,7 @@
625 # #12316 and #11870), and fork() from a worker thread is known to trigger
626 # problems with some operating systems (issue #3863): skip problematic tests
627 # on platforms known to behave badly.
628- platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
629+ platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'netbsd5',
630 'os2emx')
631
632 def _run_and_join(self, script):
624@@ -421,7 +421,7 @@
625 # #12316 and #11870), and fork() from a worker thread is known to trigger
626 # problems with some operating systems (issue #3863): skip problematic tests
627 # on platforms known to behave badly.
628- platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
629+ platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'netbsd5',
630 'os2emx')
631
632 def _run_and_join(self, script):
633--- misc/Python-2.7.4/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
634+++ misc/build/Python-2.7.4/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
633--- misc/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
634+++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
635@@ -6289,7 +6289,7 @@
636 rm -rf conftest*
637 ;;
638
639-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
640+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
641 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
642 # Find out which ABI we are using.
643 echo 'int i;' > conftest.$ac_ext
644@@ -11275,6 +11275,9 @@
645 powerpc-*-freebsd*)
646 TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
647 ;;
648+ powerpc64-*-freebsd*)
649+ TARGET=POWERPC; TARGETDIR=powerpc
650+ ;;
651 powerpc*-*-rtems*)
652 TARGET=POWERPC; TARGETDIR=powerpc
653 ;;
635@@ -6289,7 +6289,7 @@
636 rm -rf conftest*
637 ;;
638
639-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
640+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
641 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
642 # Find out which ABI we are using.
643 echo 'int i;' > conftest.$ac_ext
644@@ -11275,6 +11275,9 @@
645 powerpc-*-freebsd*)
646 TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
647 ;;
648+ powerpc64-*-freebsd*)
649+ TARGET=POWERPC; TARGETDIR=powerpc
650+ ;;
651 powerpc*-*-rtems*)
652 TARGET=POWERPC; TARGETDIR=powerpc
653 ;;
654--- misc/Python-2.7.4/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
655+++ misc/build/Python-2.7.4/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
654--- misc/Python-2.7.5/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
655+++ misc/build/Python-2.7.5/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
656@@ -97,20 +97,15 @@
657 {
658 #define IOCTL_BUFSZ 1024
659 int fd;
660- /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
661+ /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
662 format for the 'code' parameter because Python turns 0x8000000
663 into either a large positive number (PyLong or PyInt on 64-bit

--- 35 unchanged lines hidden (view full) ---

699 PyErr_Clear();
700 arg = 0;
701 if (!PyArg_ParseTuple(args,
702- "O&I|i;ioctl requires a file or file descriptor,"
703+ "O&k|i;ioctl requires a file or file descriptor,"
704 " an integer and optionally an integer or buffer argument",
705 conv_descriptor, &fd, &code, &arg)) {
706 return NULL;
656@@ -97,20 +97,15 @@
657 {
658 #define IOCTL_BUFSZ 1024
659 int fd;
660- /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
661+ /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
662 format for the 'code' parameter because Python turns 0x8000000
663 into either a large positive number (PyLong or PyInt on 64-bit

--- 35 unchanged lines hidden (view full) ---

699 PyErr_Clear();
700 arg = 0;
701 if (!PyArg_ParseTuple(args,
702- "O&I|i;ioctl requires a file or file descriptor,"
703+ "O&k|i;ioctl requires a file or file descriptor,"
704 " an integer and optionally an integer or buffer argument",
705 conv_descriptor, &fd, &code, &arg)) {
706 return NULL;
707--- misc/Python-2.7.4/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
708+++ misc/build/Python-2.7.4/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
707--- misc/Python-2.7.5/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
708+++ misc/build/Python-2.7.5/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
709@@ -38,13 +38,18 @@
710 #endif
711 #endif
712
713+#ifdef __FreeBSD__
714+#include <osreldate.h>
715+#endif
716+

--- 37 unchanged lines hidden (view full) ---

754@@ -200,6 +207,7 @@
755 (void *)arg
756 );
757
758+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
759 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
760 pthread_attr_destroy(&attrs);
761 #endif
709@@ -38,13 +38,18 @@
710 #endif
711 #endif
712
713+#ifdef __FreeBSD__
714+#include <osreldate.h>
715+#endif
716+

--- 37 unchanged lines hidden (view full) ---

754@@ -200,6 +207,7 @@
755 (void *)arg
756 );
757
758+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
759 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
760 pthread_attr_destroy(&attrs);
761 #endif
762diff -ruN misc/Python-2.7.4/configure misc/build/Python-2.7.4/configure
763--- misc/Python-2.7.4/configure 2012-04-09 18:07:36.000000000 -0500
764+++ misc/build/Python-2.7.4/configure 2012-08-01 18:44:40.000000000 -0500
762diff -ruN misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure
763--- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
764+++ misc/build/Python-2.7.5/configure 2012-08-01 18:44:40.000000000 -0500
765@@ -4916,7 +4916,7 @@
766 ;;
767 SunOS*)
768 LDLIBRARY='libpython$(VERSION).so'
769- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
770+ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
771 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
772 INSTSONAME="$LDLIBRARY".$SOVERSION

--- 5 unchanged lines hidden (view full) ---

778- case $ac_sys_system in
779- FreeBSD*)
780- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
781- ;;
782- esac
783 INSTSONAME="$LDLIBRARY".$SOVERSION
784 ;;
785 hp*|HP*)
765@@ -4916,7 +4916,7 @@
766 ;;
767 SunOS*)
768 LDLIBRARY='libpython$(VERSION).so'
769- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
770+ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
771 RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
772 INSTSONAME="$LDLIBRARY".$SOVERSION

--- 5 unchanged lines hidden (view full) ---

778- case $ac_sys_system in
779- FreeBSD*)
780- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
781- ;;
782- esac
783 INSTSONAME="$LDLIBRARY".$SOVERSION
784 ;;
785 hp*|HP*)
786diff -ruN misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py
787--- misc/Python-2.7.4/setup.py 2012-04-09 18:07:36.000000000 -0500
788+++ misc/build/Python-2.7.4/setup.py 2012-08-01 18:44:40.000000000 -0500
786diff -ruN misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
787--- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
788+++ misc/build/Python-2.7.5/setup.py 2012-08-01 18:44:40.000000000 -0500
789@@ -1555,7 +1540,7 @@
790 macros = dict()
791 libraries = []
792
793- elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
794+ elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
795 # FreeBSD's P1003.1b semaphore support is very experimental
796 # and has many known problems. (as of June 2008)
797 macros = dict()
798@@ -1607,7 +1592,7 @@
799 missing.append('linuxaudiodev')
800
801 if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
802- 'freebsd7', 'freebsd8')
803+ 'freebsd7', 'freebsd8', 'freebsd9')
804 or host_platform.startswith("gnukfreebsd")):
805 exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
806 else:
789@@ -1555,7 +1540,7 @@
790 macros = dict()
791 libraries = []
792
793- elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
794+ elif host_platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
795 # FreeBSD's P1003.1b semaphore support is very experimental
796 # and has many known problems. (as of June 2008)
797 macros = dict()
798@@ -1607,7 +1592,7 @@
799 missing.append('linuxaudiodev')
800
801 if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
802- 'freebsd7', 'freebsd8')
803+ 'freebsd7', 'freebsd8', 'freebsd9')
804 or host_platform.startswith("gnukfreebsd")):
805 exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
806 else: