python-freebsd.patch (e7d4ae22) python-freebsd.patch (fb5941c3)
1diff -ruN misc/Python-2.7.17/Modules/fcntlmodule.c misc/build/Python-2.7.17/Modules/fcntlmodule.c
2--- misc/Python-2.7.17/Modules/fcntlmodule.c 2019-10-19 13:38:44.000000000 -0500
3+++ misc/build/Python-2.7.17/Modules/fcntlmodule.c 2020-01-09 22:59:15.052886000 -0500
1diff -ruN misc/Python-2.7.18/Modules/fcntlmodule.c misc/build/Python-2.7.18/Modules/fcntlmodule.c
2--- misc/Python-2.7.18/Modules/fcntlmodule.c 2019-10-19 13:38:44.000000000 -0500
3+++ misc/build/Python-2.7.18/Modules/fcntlmodule.c 2020-01-09 22:59:15.052886000 -0500
4@@ -98,20 +98,15 @@
5 {
6 #define IOCTL_BUFSZ 1024
7 int fd;
8- /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
9+ /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
10 format for the 'code' parameter because Python turns 0x8000000
11 into either a large positive number (PyLong or PyInt on 64-bit

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

47 PyErr_Clear();
48 arg = 0;
49 if (!PyArg_ParseTuple(args,
50- "O&I|i;ioctl requires a file or file descriptor,"
51+ "O&k|i;ioctl requires a file or file descriptor,"
52 " an integer and optionally an integer or buffer argument",
53 conv_descriptor, &fd, &code, &arg)) {
54 return NULL;
4@@ -98,20 +98,15 @@
5 {
6 #define IOCTL_BUFSZ 1024
7 int fd;
8- /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
9+ /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
10 format for the 'code' parameter because Python turns 0x8000000
11 into either a large positive number (PyLong or PyInt on 64-bit

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

47 PyErr_Clear();
48 arg = 0;
49 if (!PyArg_ParseTuple(args,
50- "O&I|i;ioctl requires a file or file descriptor,"
51+ "O&k|i;ioctl requires a file or file descriptor,"
52 " an integer and optionally an integer or buffer argument",
53 conv_descriptor, &fd, &code, &arg)) {
54 return NULL;
55diff -ruN misc/Python-2.7.17/Python/thread_pthread.h misc/build/Python-2.7.17/Python/thread_pthread.h
56--- misc/Python-2.7.17/Python/thread_pthread.h 2019-10-19 13:38:44.000000000 -0500
57+++ misc/build/Python-2.7.17/Python/thread_pthread.h 2020-01-09 22:59:15.053731000 -0500
55diff -ruN misc/Python-2.7.18/Python/thread_pthread.h misc/build/Python-2.7.18/Python/thread_pthread.h
56--- misc/Python-2.7.18/Python/thread_pthread.h 2019-10-19 13:38:44.000000000 -0500
57+++ misc/build/Python-2.7.18/Python/thread_pthread.h 2020-01-09 22:59:15.053731000 -0500
58@@ -38,13 +38,18 @@
59 #endif
60 #endif
61
62+#ifdef __FreeBSD__
63+#include <osreldate.h>
64+#endif
65+

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

103@@ -230,6 +237,7 @@
104 #endif
105 pythread_wrapper, callback);
106
107+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
108 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
109 pthread_attr_destroy(&attrs);
110 #endif
58@@ -38,13 +38,18 @@
59 #endif
60 #endif
61
62+#ifdef __FreeBSD__
63+#include <osreldate.h>
64+#endif
65+

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

103@@ -230,6 +237,7 @@
104 #endif
105 pythread_wrapper, callback);
106
107+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
108 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
109 pthread_attr_destroy(&attrs);
110 #endif
111diff -ruN misc/Python-2.7.17/configure misc/build/Python-2.7.17/configure
112--- misc/Python-2.7.17/configure 2019-10-19 13:38:44.000000000 -0500
113+++ misc/build/Python-2.7.17/configure 2020-01-09 22:59:15.072666000 -0500
111diff -ruN misc/Python-2.7.18/configure misc/build/Python-2.7.18/configure
112--- misc/Python-2.7.18/configure 2019-10-19 13:38:44.000000000 -0500
113+++ misc/build/Python-2.7.18/configure 2020-01-09 22:59:15.072666000 -0500
114@@ -5477,7 +5477,7 @@
115 ;;
116 SunOS*)
117 LDLIBRARY='libpython$(VERSION).so'
118- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
119+ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
120 RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
121 INSTSONAME="$LDLIBRARY".$SOVERSION

--- 13 unchanged lines hidden --- 		114@@ -5477,7 +5477,7 @@
115 ;;
116 SunOS*)
117 LDLIBRARY='libpython$(VERSION).so'
118- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
119+ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
120 RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
121 INSTSONAME="$LDLIBRARY".$SOVERSION

--- 13 unchanged lines hidden ---