diff options
author | tg <tg@FreeBSD.org> | 1998-07-23 15:49:12 +0800 |
---|---|---|
committer | tg <tg@FreeBSD.org> | 1998-07-23 15:49:12 +0800 |
commit | ad0e996dbdba0de568b6d19d52e8ca9c0c6aedd8 (patch) | |
tree | 483a3376c8e089ace5292b5ccbf6b2fcb0b77c21 | |
parent | cc5d7dd9c889df5902bb7ca4020a742fcef39865 (diff) | |
download | freebsd-ports-gnome-ad0e996dbdba0de568b6d19d52e8ca9c0c6aedd8.tar.gz freebsd-ports-gnome-ad0e996dbdba0de568b6d19d52e8ca9c0c6aedd8.tar.zst freebsd-ports-gnome-ad0e996dbdba0de568b6d19d52e8ca9c0c6aedd8.zip |
Use ldconfig to check for libc_r, not an absolute path. Thread support
should now be compiled in on -current.
Suggested by: Jacques Vidrine
-rw-r--r-- | lang/python+ipv6/Makefile | 5 | ||||
-rw-r--r-- | lang/python-devel/Makefile | 5 | ||||
-rw-r--r-- | lang/python/Makefile | 5 | ||||
-rw-r--r-- | lang/python15/Makefile | 5 | ||||
-rw-r--r-- | lang/python20/Makefile | 5 | ||||
-rw-r--r-- | lang/python21/Makefile | 5 | ||||
-rw-r--r-- | lang/python22/Makefile | 5 | ||||
-rw-r--r-- | lang/python23/Makefile | 5 | ||||
-rw-r--r-- | lang/python24/Makefile | 5 | ||||
-rw-r--r-- | lang/python25/Makefile | 5 | ||||
-rw-r--r-- | lang/python26/Makefile | 5 | ||||
-rw-r--r-- | lang/python27/Makefile | 5 | ||||
-rw-r--r-- | lang/python30/Makefile | 5 | ||||
-rw-r--r-- | lang/python31/Makefile | 5 | ||||
-rw-r--r-- | lang/python32/Makefile | 5 |
15 files changed, 45 insertions, 30 deletions
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile index b7fbb39338b3..ac388ca91a9e 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.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index b7fbb39338b3..ac388ca91a9e 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.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python/Makefile b/lang/python/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python15/Makefile b/lang/python15/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python20/Makefile b/lang/python20/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python21/Makefile b/lang/python21/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python22/Makefile b/lang/python22/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python23/Makefile b/lang/python23/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python24/Makefile b/lang/python24/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python25/Makefile b/lang/python25/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python26/Makefile b/lang/python26/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python27/Makefile b/lang/python27/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python30/Makefile b/lang/python30/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python31/Makefile b/lang/python31/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" diff --git a/lang/python32/Makefile b/lang/python32/Makefile index b7fbb39338b3..ac388ca91a9e 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.34 1998/06/19 09:00:49 tg Exp $ +# $Id: Makefile,v 1.35 1998/06/25 06:43:26 tg Exp $ # DISTNAME= pyth151 @@ -56,7 +56,8 @@ SETUP_LOCAL= Setup.tk # This option is enabled by default. # WITH_THREADS?= yes -.if exists(/usr/lib/libc_r.a) && defined(WITH_THREADS) && ${WITH_THREADS} == yes +LIBC_R!= /sbin/ldconfig -r | grep c_r +.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes CONFIGURE_ARGS+= --with-thread CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV= LDFLAGS="-pthread ${LDFLAGS}" |