From dev-return-8040-daniel=haxx.se@subversion.apache.org Wed Dec 1 06:15:06 2010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on giant.haxx.se X-Spam-Level: X-Spam-Status: No, score=-1.5 required=3.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9.1) with SMTP id oB15F57g020048 for ; Wed, 1 Dec 2010 06:15:06 +0100 Received: (qmail 81659 invoked by uid 500); 1 Dec 2010 05:14:58 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 81650 invoked by uid 99); 1 Dec 2010 05:14:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 05:14:57 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=10.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS Received-SPF: pass (athena.apache.org: domain of artagnon@gmail.com designates 209.85.213.171 as permitted sender) Received: from [209.85.213.171] (HELO mail-yx0-f171.google.com) (209.85.213.171) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Dec 2010 05:14:50 +0000 Received: by yxf34 with SMTP id 34so1108992yxf.16 for ; Tue, 30 Nov 2010 21:14:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=P3IJNcPqA6qUDhIoC9Om5l3xh1vTuR5hz3vZx/F+WZg=; b=IHGDyd3U2kw6sXbgYvQTzLLUqj44IAPDirXFUPdsOWBbbe5ZtXbwe1mHbwCxFnXIK9 m3feBunXGRVpJPz/v1Vew5RZ6NB0qmVL8g1YjdNEXVQWffcyIHwu0u5MRfGm1p078Zg0 aIoW2RznTxzGjV6abcEFP3O7Ls5GPM4wEJBoE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=PxVrGQ+CaKvfWmaGheR9CNvaSZcp25B236I2Zvudw6ncs+3df05BD9I7OSFWmziERW KioqmgZAwiUkP0v0YlruUuyihigvBXIBmkqmohXz8UVi4xhaXXfIn+72iRe7C2x2cawu otwv6n3kKq2i/DWNWK5po6n6Nd/nxsDNJa9mU= Received: by 10.151.10.12 with SMTP id n12mr1423017ybi.220.1291180469260; Tue, 30 Nov 2010 21:14:29 -0800 (PST) Received: from debian ([59.92.25.219]) by mx.google.com with ESMTPS id d15sm7835689ana.35.2010.11.30.21.14.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 30 Nov 2010 21:14:27 -0800 (PST) Date: Wed, 1 Dec 2010 10:48:37 +0530 From: Ramkumar Ramachandra To: Stefan Sperling Cc: Subversion-dev Mailing List , Daniel Shahaf Subject: Re: [PATCH] Fix Makefile.svn to build APR with threads Message-ID: <20101201051834.GA26993@debian> References: <20101130083907.GA920@debian> <20101130114141.GA28823@ted.stsp.name> <20101130184753.GA6523@debian> <20101130185236.GB19572@ted.stsp.name> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101130185236.GB19572@ted.stsp.name> User-Agent: Mutt/1.5.20 (2009-06-14) X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.3.5 (giant.haxx.se [80.67.6.50]); Wed, 01 Dec 2010 06:15:06 +0100 (CET) X-Friend: Nope Hi Stefan, Thanks for the suggestions. How about this? [[[ Makefile.svn: Optionally allow building with threading support * tools/dev/unix-build/Makefile.svn: Add a new THREADING variable to control whether APR and sqlite should be built with threading support. Suggested by: stsp Review by: stsp ]]] Index: tools/dev/unix-build/Makefile.svn =================================================================== --- tools/dev/unix-build/Makefile.svn (revision 1040690) +++ tools/dev/unix-build/Makefile.svn (working copy) @@ -233,6 +233,12 @@ fi touch $@ +ifdef THREADING +THREADS_FLAG=--enable-threads +else +THREADS_FLAG=--disable-threads +endif + # configure apr $(APR_OBJDIR)/.configured: $(APR_OBJDIR)/.retrieved cp $(APR_SRCDIR)/build/apr_hints.m4 \ @@ -246,7 +252,7 @@ $(APR_SRCDIR)/configure \ --prefix=$(PREFIX)/apr \ --enable-maintainer-mode \ - --disable-threads + $(THREADS_FLAG) touch $@ # compile apr @@ -704,6 +710,12 @@ tar -C $(SRCDIR) -zxf $(DISTDIR)/$(SQLITE_DIST) touch $@ +ifdef THREADING +THREADSAFE_FLAG=--enable-threadsafe +else +THREADSAFE_FLAG=--disable-threadsafe +endif + # configure sqlite $(SQLITE_OBJDIR)/.configured: $(SQLITE_OBJDIR)/.retrieved cd $(SQLITE_OBJDIR) \ @@ -711,7 +723,7 @@ $(SQLITE_SRCDIR)/configure \ --prefix=$(PREFIX)/sqlite \ --disable-tcl \ - --disable-threadsafe + $(THREADSAFE_FLAG) touch $@ # compile sqlite