From owner-cvs-all@FreeBSD.ORG  Sun Oct 10 02:35:04 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0730216A4CE; Sun, 10 Oct 2004 02:35:04 +0000 (GMT)
Received: from drop.bsdchat.com (drop.bsdchat.com [209.237.225.38])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DEB1F43D4C; Sun, 10 Oct 2004 02:35:03 +0000 (GMT)
	(envelope-from clive@tongi.org)
Received: from CARTIER (drag.bsdchat.com [209.237.225.37])
	by drop.bsdchat.com (8.13.1/8.13.1) with SMTP id i9A2Ybwb066199;
	Sun, 10 Oct 2004 02:34:40 GMT
	(envelope-from clive@tongi.org)
Received: (nullmailer pid 22995 invoked by uid 1000);
	Sun, 10 Oct 2004 02:34:34 -0000
Date: Sun, 10 Oct 2004 10:34:33 +0800
From: Clive Lin <clive@tongi.org>
To: Clement Laforet <clement@FreeBSD.org>
Message-ID: <20041010023433.GA22907@CARTIER.mind.com>
References: <200410071759.i97HxIup039053@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200410071759.i97HxIup039053@repoman.freebsd.org>
X-Operating-System: FreeBSD i386
X-PGP-key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xA008C03E
User-Agent: Mutt/1.5.6i
cc: cvs-ports@FreeBSD.org
cc: Kris Kennaway <kris@FreeBSD.org>
cc: cvs-all@FreeBSD.org
cc: ports-committers@FreeBSD.org
Subject: Unable to build apache2 with threads (Re: cvs commit: ports/Mk
	bsd.port.mk)
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Oct 2004 02:35:04 -0000

On Thu, Oct 07, 2004 at 05:59:18PM +0000, Kris Kennaway wrote:
> kris        2004-10-07 17:59:18 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     Mk                   bsd.port.mk 
>   Log:
>   Change the default value of PTHREAD_LIBS to -pthread for 5.x and
>   beyond.  This avoids linking shared libraries with the thread library,
>   which causes problems when trying to change from one thread library to
>   another.  Instead all binaries that link to a library that uses
>   threads must themselves respect PTHREAD_LIBS.
>   
>   Submitted by:   deischen, marcus
>   Approved by:    portmgr
>   
>   Revision  Changes    Path
>   1.499     +2 -2      ports/Mk/bsd.port.mk

http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.port.mk.diff?r1=1.498&r2=1.499

this seems to stop apache2 build with threads. (WITH_MPM=worker)

Clement:

    dirty hack as below, although I dont think it is a correct fix...

--- Makefile~	Sun Oct 10 09:45:07 2004
+++ Makefile	Sun Oct 10 09:45:33 2004
@@ -148,7 +148,7 @@
 LDCONFIG_DIRS=		%%PREFIX%%/lib/apache2
 .endif
 
-WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//}
+WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS}
 WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 
 .include "${APACHEDIR}/Makefile.doc"
--- Makefile.modules~	Sun Oct 10 09:45:12 2004
+++ Makefile.modules	Sun Oct 10 09:46:06 2004
@@ -93,8 +93,8 @@
 
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
-.   if ${WITH_PTHREAD_LIBS} != "c_r" && ${OSVERSION} > 500023
-CONFIGURE_ENV+=		apr_cv_pthreads_lib=-l${WITH_PTHREAD_LIBS} \
+.   if ${WITH_PTHREAD_LIBS} != "-lc_r" && ${OSVERSION} > 500023
+CONFIGURE_ENV+=		apr_cv_pthreads_lib=${WITH_PTHREAD_LIBS} \
 			apr_cv_pthreads_cflags=${WITH_PTHREAD_CFLAGS}
 .  else
 CFLAGS+=		-DFREEBSD_THREAD_HACK

-- 
Clive Tong-I Lin | http://tongi.org | PGP KeyID: A008C03E