Skip to content

Commit db6c567

Browse files
committed
Disable GNU pth support
1 parent 1b8c783 commit db6c567

3 files changed

Lines changed: 3 additions & 38 deletions

File tree

Python/thread.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ static size_t _pythread_stacksize = 0;
114114
#endif
115115

116116
#ifdef HAVE_PTH
117+
#error GNU pth threads are now unsupported, and code will be removed in 3.3.
117118
#include "thread_pth.h"
118119
#undef _POSIX_THREADS
119120
#endif

configure

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 74979 .
2+
# From configure.in Revision: 75678 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.2.
55
#
@@ -1352,7 +1352,6 @@ Optional Packages:
13521352
disable/enable thread support
13531353
--with(out)-thread[=DIRECTORY]
13541354
deprecated; use --with(out)-threads
1355-
--with-pth use GNU pth threading libraries
13561355
--with(out)-doc-strings disable/enable documentation strings
13571356
--with(out)-tsc enable/disable timestamp counter profile
13581357
--with(out)-pymalloc disable/enable specialized mallocs
@@ -15843,28 +15842,6 @@ _ACEOF
1584315842
THREADOBJ="Python/thread.o"
1584415843
else
1584515844

15846-
{ echo "$as_me:$LINENO: checking for --with-pth" >&5
15847-
echo $ECHO_N "checking for --with-pth... $ECHO_C" >&6; }
15848-
15849-
# Check whether --with-pth was given.
15850-
if test "${with_pth+set}" = set; then
15851-
withval=$with_pth; { echo "$as_me:$LINENO: result: $withval" >&5
15852-
echo "${ECHO_T}$withval" >&6; }
15853-
cat >>confdefs.h <<\_ACEOF
15854-
#define WITH_THREAD 1
15855-
_ACEOF
15856-
15857-
15858-
cat >>confdefs.h <<\_ACEOF
15859-
#define HAVE_PTH 1
15860-
_ACEOF
15861-
15862-
LIBS="-lpth $LIBS"
15863-
THREADOBJ="Python/thread.o"
15864-
else
15865-
{ echo "$as_me:$LINENO: result: no" >&5
15866-
echo "${ECHO_T}no" >&6; }
15867-
1586815845
# Just looking for pthread_create in libpthread is not enough:
1586915846
# on HP/UX, pthread.h renames pthread_create to a different symbol name.
1587015847
# So we really have to include pthread.h, and then link.
@@ -16315,8 +16292,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1631516292
conftest$ac_exeext conftest.$ac_ext
1631616293
fi
1631716294

16318-
fi
16319-
1632016295

1632116296
fi
1632216297

configure.in

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2018,17 +2018,6 @@ yes
20182018
AC_DEFINE(MACH_C_THREADS, 1,
20192019
[Define if you are using Mach cthreads under mach /])
20202020
THREADOBJ="Python/thread.o"],[
2021-
AC_MSG_CHECKING(for --with-pth)
2022-
AC_ARG_WITH([pth],
2023-
AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
2024-
[AC_MSG_RESULT($withval)
2025-
AC_DEFINE([WITH_THREAD])
2026-
AC_DEFINE([HAVE_PTH], 1,
2027-
[Define if you have GNU PTH threads.])
2028-
LIBS="-lpth $LIBS"
2029-
THREADOBJ="Python/thread.o"],
2030-
[AC_MSG_RESULT(no)
2031-
20322021
# Just looking for pthread_create in libpthread is not enough:
20332022
# on HP/UX, pthread.h renames pthread_create to a different symbol name.
20342023
# So we really have to include pthread.h, and then link.
@@ -2064,7 +2053,7 @@ pthread_create (NULL, NULL, start_routine, NULL)], [
20642053
LIBS="$LIBS -lcma"
20652054
THREADOBJ="Python/thread.o"],[
20662055
USE_THREAD_MODULE="#"])
2067-
])])])])])])])])
2056+
])])])])])])])
20682057

20692058
AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
20702059
LIBS="$LIBS -lmpc"

0 commit comments

Comments
 (0)