From dccefb8a4b9bb644e2da8824b59d548ff80fe881 Mon Sep 17 00:00:00 2001 From: Thomas Gellekum Date: Wed, 7 Jan 1998 08:32:54 +0000 Subject: Make python work with threads again. Looks like our libc_r implements an older draft of the pthread standard. --- lang/python+ipv6/Makefile | 7 +++---- lang/python+ipv6/files/patch-ab | 11 +++++++++++ lang/python-devel/Makefile | 7 +++---- lang/python/Makefile | 7 +++---- lang/python15/Makefile | 7 +++---- lang/python15/files/patch-ab | 11 +++++++++++ lang/python20/Makefile | 7 +++---- lang/python21/Makefile | 7 +++---- lang/python22/Makefile | 7 +++---- lang/python23/Makefile | 7 +++---- lang/python24/Makefile | 7 +++---- lang/python25/Makefile | 7 +++---- lang/python26/Makefile | 7 +++---- lang/python27/Makefile | 7 +++---- lang/python30/Makefile | 7 +++---- lang/python31/Makefile | 7 +++---- lang/python32/Makefile | 7 +++---- 17 files changed, 67 insertions(+), 60 deletions(-) create mode 100644 lang/python+ipv6/files/patch-ab create mode 100644 lang/python15/files/patch-ab diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python+ipv6/Makefile +++ b/lang/python+ipv6/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python+ipv6/files/patch-ab b/lang/python+ipv6/files/patch-ab new file mode 100644 index 000000000000..13737981fa0a --- /dev/null +++ b/lang/python+ipv6/files/patch-ab @@ -0,0 +1,11 @@ +--- Python/thread_pthread.h.orig Tue Jun 3 00:25:45 1997 ++++ Python/thread_pthread.h Tue Jan 6 19:20:08 1998 +@@ -66,7 +66,7 @@ + # define PY_PTHREAD_D7 + # endif + +-#elif defined(__DGUX) ++#elif defined(__DGUX) || defined(__FreeBSD__) + # define PY_PTHREAD_D6 + + #else /* Default case */ diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python/Makefile b/lang/python/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python15/Makefile b/lang/python15/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python15/files/patch-ab b/lang/python15/files/patch-ab new file mode 100644 index 000000000000..13737981fa0a --- /dev/null +++ b/lang/python15/files/patch-ab @@ -0,0 +1,11 @@ +--- Python/thread_pthread.h.orig Tue Jun 3 00:25:45 1997 ++++ Python/thread_pthread.h Tue Jan 6 19:20:08 1998 +@@ -66,7 +66,7 @@ + # define PY_PTHREAD_D7 + # endif + +-#elif defined(__DGUX) ++#elif defined(__DGUX) || defined(__FreeBSD__) + # define PY_PTHREAD_D6 + + #else /* Default case */ diff --git a/lang/python20/Makefile b/lang/python20/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python21/Makefile b/lang/python21/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python22/Makefile b/lang/python22/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python23/Makefile b/lang/python23/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python24/Makefile b/lang/python24/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python25/Makefile b/lang/python25/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python26/Makefile b/lang/python26/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python27/Makefile b/lang/python27/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python30/Makefile b/lang/python30/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python31/Makefile b/lang/python31/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif diff --git a/lang/python32/Makefile b/lang/python32/Makefile index ebccd69dda9a..265572375abd 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.18 1997/11/24 15:12:43 tg Exp $ +# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ # DISTNAME= python1.5 @@ -43,10 +43,9 @@ SETUP_LOCAL= Setup.tk # to 'yes', and you must have the FreeBSD threading c library (libc_r) # installed. See 'man 3 pthread' for details on libc_r. # -# This is now turned off by default because it doesn't work -# with our libc_r. +# This option is enabled by default. # -WITH_THREADS?= no +WITH_THREADS?= yes .if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread .endif -- cgit v1.2.3