[kris@FreeBSD.org: cvs commit: ports/www/zope Makefile]

[Hye-Shik Chang]

On Thu, Aug 07, 2003 at 12:56:23PM +0200, Neil Blakey-Milner wrote:
> On Thu 2003-08-07 (03:46), Kris Kennaway wrote:
> > On Thu, Aug 07, 2003 at 12:31:05PM +0200, Neil Blakey-Milner wrote:
> > > On Thu 2003-08-07 (03:02), Kris Kennaway wrote:
> > > > FYI.  This port will be removed in 3 months if it is still broken.
> > > 
> > > There's something broken in bento's environment - lang/python21 builds
> > > with threads by default, and the bento python21 package doesn't seem to
> > > have threads enabled.  The check in lang/python21:
> > > 
> > > LIBC_R!=        /sbin/ldconfig -r | grep c_r || true
> > 
> > Why do you need to do it this way?  libc_r is standard on FreeBSD, and
> > disabled iff you set NOLIBC_R.
> 
> Ask perky (it is in the lang/python21 port), although this check has
> been there since at least 1998 apparently - cvs annotate shows:
> 
> 1.42         (asami    02-Dec-98): LIBC_R!=     /sbin/ldconfig -r | grep c_r || true
> 
> I'm pretty sure the zope port used to build in the bento environment,
> though.
> 
> I'm sure everyone will be happy if we just remove the whole libc_r check
> and honour WITHOUT_THREADS ?
> 

Okie. I don't like that weird detection, too.
Please review this patch.

Index: python15/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/python15/Makefile,v
retrieving revision 1.83
diff -u -r1.83 Makefile
--- python15/Makefile	4 Jul 2003 11:57:53 -0000	1.83
+++ python15/Makefile	7 Aug 2003 11:00:32 -0000
@@ -37,10 +37,9 @@
 
 #
 # If you don't want to use Python's thread module, you need to set
-# WITHOUT_THREADS. libc_r should be installed on nowadays' systems.
+# WITHOUT_THREADS.
 #
-LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(NOLIBC_R) && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
Index: python20/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/python20/Makefile,v
retrieving revision 1.90
diff -u -r1.90 Makefile
--- python20/Makefile	4 Jul 2003 11:57:53 -0000	1.90
+++ python20/Makefile	7 Aug 2003 11:00:32 -0000
@@ -39,8 +39,7 @@
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
 #
-LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(NOLIBC_R) && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
Index: python21/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/python21/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- python21/Makefile	4 Jul 2003 11:57:53 -0000	1.98
+++ python21/Makefile	7 Aug 2003 11:00:33 -0000
@@ -33,8 +33,7 @@
 # If you don't want to use Python's thread module, you need to set
 # WITHOUT_THREADS.
 #
-LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(NOLIBC_R) && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"


Regards,
    Hye-Shik =)