Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id C7D534196F0 for ; Mon, 29 Mar 2010 09:43:33 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.998 X-Spam-Level: X-Spam-Status: No, score=-1.998 tagged_above=-999 required=5 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XIoq2KGl9OK0 for ; Mon, 29 Mar 2010 09:43:32 -0700 (PDT) Received: from mail-iw0-f204.google.com (mail-iw0-f204.google.com [209.85.223.204]) by olra.theworths.org (Postfix) with ESMTP id 97BD9431FC1 for ; Mon, 29 Mar 2010 09:43:32 -0700 (PDT) Received: by iwn42 with SMTP id 42so667934iwn.6 for ; Mon, 29 Mar 2010 09:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:received:message-id:subject:from:to:content-type; bh=Ex9jT2VPMeG03/+eo3IEBf0fSspPx+Zy/Uf2UaalOew=; b=dYg467W449R6fj4TuIo3RsZitsawvJLUDLDkjSxYvpYUI35GKB3lM8CSuZg+G8ZyGA swEJKJVSWg6yCqvgf84KiX3yMRJrJ5zZppklAB/Z5SkYStxGISvrlupM1oF2C44Irnkn f0u4zSUsRDfO3X+Xr55iKe82qhksnnQsGipBg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; b=iw7YVPGbugyvRoasCoz6PuElJdV5rIPsi7Ze/EihZFZf+i1FM269ddXF/gVeJYwxrw dm2cwwRHNfCyuTVvdJ6BkQBVrDD6AkUDjmvmi1sNIdYbbLvfnKY9z4CLqdyX5Z2sLjCU bjrElVsGQBKahIAjOy/S59K6yztoijrIspJyY= MIME-Version: 1.0 Received: by 10.231.32.9 with HTTP; Mon, 29 Mar 2010 09:43:31 -0700 (PDT) In-Reply-To: <87ljdbh61t.fsf@steelpick.2x.cz> References: <330356ae1003282354s639a0ff5p34a6a29bbe145ed5@mail.gmail.com> <87ljdbh61t.fsf@steelpick.2x.cz> Date: Mon, 29 Mar 2010 09:43:31 -0700 Received: by 10.231.153.205 with SMTP id l13mr2659405ibw.64.1269881011810; Mon, 29 Mar 2010 09:43:31 -0700 (PDT) Message-ID: <330356ae1003290943v19cfcabeveff2cdfd46df5601@mail.gmail.com> From: Bhaskara Marthi To: notmuch@notmuchmail.org Content-Type: multipart/alternative; boundary=005045013bff9db1610482f336b9 Subject: Re: [notmuch] [PATCH] Fix compilation when getline is not available X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2010 16:43:33 -0000 --005045013bff9db1610482f336b9 Content-Type: text/plain; charset=ISO-8859-1 On Mon, Mar 29, 2010 at 1:43 AM, Michal Sojka wrote: > On Mon, 29 Mar 2010, Bhaskara Marthi wrote: > > Hi all, I'm trying to build notmuch on os x (master branch from today). > I > > got the ports for gmime and xapian, and installed talloc from source, > with > > some minor hitches (just getting talloc alone from samba failed on > autoconf > > due to lack of libreplace.m4, so I installed all of samba from a port; a > > pkg-config file for talloc was not put in the right place after that, > > though, so I had to make one). > > > > Anyway, now compilation runs into the following error. Looks like an > issue > > with the makefile given that getline is in fact defined in compat/. How > > should I fix this? > > The following patch should fix it. > Works for me. Thanks! - Bhaskara > --- > Makefile | 2 +- > compat/Makefile.local | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 46f001c..93c6b2b 100644 > --- a/Makefile > +++ b/Makefile > @@ -46,7 +46,7 @@ subdirs = compat emacs lib > global_deps = Makefile Makefile.config Makefile.local \ > $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local) > > -include Makefile.config Makefile.local $(subdirs:%=%/Makefile.local) > +include Makefile.config $(subdirs:%=%/Makefile.local) Makefile.local > > # The user has not set any verbosity, default to quiet mode and inform the > # user how to enable verbose compiles. > diff --git a/compat/Makefile.local b/compat/Makefile.local > index 17b4514..9f84c5f 100644 > --- a/compat/Makefile.local > +++ b/compat/Makefile.local > @@ -1,7 +1,7 @@ > dir := compat > extra_cflags += -I$(dir) > > -notmuch_compat_srcs = > +notmuch_compat_srcs := > > ifneq ($(HAVE_GETLINE),1) > notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c > -- > 1.7.0.2 > --005045013bff9db1610482f336b9 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable

On Mon, Mar 29, 2010 at 1:43 AM, Michal = Sojka <sojkam1@= fel.cvut.cz> wrote:
On Mon, 29 Mar 2010, Bhaskara Marthi wrote:
> Hi all, I'm trying to build notmuch on os x (master branch from to= day). =A0I
> got the ports for gmime and xapian, and installed talloc from source, = with
> some minor hitches (just getting talloc alone from samba failed on aut= oconf
> due to lack of libreplace.m4, so I installed all of samba from a port;= a
> pkg-config file for talloc was not put in the right place after that,<= br> > though, so I had to make one).
>
> Anyway, now compilation runs into the following error. =A0Looks like a= n issue
> with the makefile given that getline is in fact defined in compat/. = =A0How
> should I fix this?

The following patch should fix it.

Works for me.= =A0 Thanks!
- Bhaskara

=A0
---
=A0Makefile =A0 =A0 =A0 =A0 =A0 =A0 =A0| =A0 =A02 +-
=A0compat/Makefile.local | =A0 =A02 +-
=A02 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 46f001c..93c6b2b 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ subdirs =3D compat emacs lib
=A0global_deps =3D Makefile Makefile.config Makefile.local \
=A0 =A0 =A0 =A0$(subdirs:%=3D%/Makefile) $(subdirs:%=3D%/Makefile.local)
-include Makefile.config Makefile.local $(subdirs:%=3D%/Makefile.local)
+include Makefile.config $(subdirs:%=3D%/Makefile.local) Makefile.local

=A0# The user has not set any verbosity, default to quiet mode and inform t= he
=A0# user how to enable verbose compiles.
diff --git a/compat/Makefile.local b/compat/Makefile.local
index 17b4514..9f84c5f 100644
--- a/compat/Makefile.local
+++ b/compat/Makefile.local
@@ -1,7 +1,7 @@
=A0dir :=3D compat
=A0extra_cflags +=3D -I$(dir)

-notmuch_compat_srcs =3D
+notmuch_compat_srcs :=3D

=A0ifneq ($(HAVE_GETLINE),1)
=A0notmuch_compat_srcs +=3D $(dir)/getline.c $(dir)/getdelim.c
--
1.7.0.2

--005045013bff9db1610482f336b9--