1 Return-Path: <bgamari.foss@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 354EA431FBC
\r
6 for <notmuch@notmuchmail.org>; Mon, 25 Jan 2010 22:16:02 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.716 tagged_above=-999 required=5
\r
12 tests=[AWL=-0.117, BAYES_00=-2.599] autolearn=ham
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id aLhV80SFRCGz for <notmuch@notmuchmail.org>;
\r
16 Mon, 25 Jan 2010 22:15:59 -0800 (PST)
\r
17 Received: from mail-qy0-f202.google.com (mail-qy0-f202.google.com
\r
19 by olra.theworths.org (Postfix) with ESMTP id 02FBE431FAE
\r
20 for <notmuch@notmuchmail.org>; Mon, 25 Jan 2010 22:15:58 -0800 (PST)
\r
21 Received: by qyk40 with SMTP id 40so2316897qyk.22
\r
22 for <notmuch@notmuchmail.org>; Mon, 25 Jan 2010 22:15:58 -0800 (PST)
\r
23 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
24 h=domainkey-signature:received:received:from:to:cc:subject:date
\r
25 :message-id:x-mailer:in-reply-to:references;
\r
26 bh=79DiVqXq8uJM2Ueo242GdREH4M/GKkpILr1eDGatOEY=;
\r
27 b=ZuGwi/AJPZ6XjyeEfPUvGdH2kQLGeCMUAzEZsv7RAt4AwbPr/5+INCO5R9nv8OIhCQ
\r
28 YG0PlJG5j3wzyHzr+H87cvfoJvIGrtYQfaBJ8jsqMkn48kBOUcji/2k31jhQkUHHOOie
\r
29 HPu0zNldz3eYSWgKmGVtEW3kloTs5NwgrN8Yc=
\r
30 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
\r
31 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
32 b=pFI12Tdlj4uX3yypKqgiq5Ol4uWDnSYp+i4QTttrnwIuw3xj4rTrX6QhEh+S07TZlj
\r
33 Rz+nirYEgYKmvTbWQNSyFk+OcAHLVRmdXhFYxSGQ7tJ8KlRgk3shuRgBHEQU4jRsg/MI
\r
34 rn3YmI5rRfmftWioOCDkrnH6Mz/OiybRgz3bw=
\r
35 Received: by 10.229.71.66 with SMTP id g2mr1138924qcj.16.1264486558488;
\r
36 Mon, 25 Jan 2010 22:15:58 -0800 (PST)
\r
37 Received: from localhost.localdomain (umass-959-100.wireless.umass.edu
\r
39 by mx.google.com with ESMTPS id 20sm3653724qyk.1.2010.01.25.22.15.56
\r
40 (version=SSLv3 cipher=RC4-MD5); Mon, 25 Jan 2010 22:15:57 -0800 (PST)
\r
41 From: Ben Gamari <bgamari.foss@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Date: Tue, 26 Jan 2010 01:15:50 -0500
\r
44 Message-Id: <1264486550-1479-1-git-send-email-bgamari.foss@gmail.com>
\r
45 X-Mailer: git-send-email 1.6.3.3
\r
46 In-Reply-To: <1264484247-sup-7128@ben-laptop>
\r
47 References: <1264484247-sup-7128@ben-laptop>
\r
48 Subject: [notmuch] [PATCH] Build and link against notmuch shared library
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Tue, 26 Jan 2010 06:16:02 -0000
\r
63 Inger in #notmuch brought to light some build issues that will occur when the
\r
64 notmuch binary is being built before libnotmuch is installed. Here is an
\r
65 updated patch that resolves these issues.
\r
70 Makefile.local | 6 ++++--
\r
71 lib/Makefile.local | 9 +++++----
\r
72 4 files changed, 11 insertions(+), 6 deletions(-)
\r
74 diff --git a/.gitignore b/.gitignore
\r
75 index efa98fb..daf8094 100644
\r
78 @@ -5,6 +5,7 @@ tags
\r
86 diff --git a/Makefile b/Makefile
\r
87 index 64b9d4a..6f296bb 100644
\r
91 +SONAME = libnotmuch.so.1
\r
92 WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
\r
93 WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
\r
95 diff --git a/Makefile.local b/Makefile.local
\r
96 index 04bac83..5b6af0a 100644
\r
97 --- a/Makefile.local
\r
98 +++ b/Makefile.local
\r
99 @@ -21,8 +21,8 @@ notmuch_client_srcs = \
\r
102 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
\r
103 -notmuch: $(notmuch_client_modules) lib/notmuch.a
\r
104 - $(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@
\r
105 +notmuch: $(notmuch_client_modules) lib/libnotmuch.so
\r
106 + $(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(filter-out lib/libnotmuch.so,$^) $(FINAL_LDFLAGS) -o $@
\r
108 notmuch.1.gz: notmuch.1
\r
109 $(call quiet,gzip) --stdout $^ > $@
\r
110 @@ -33,6 +33,8 @@ install: all notmuch.1.gz
\r
113 install notmuch $(DESTDIR)$(prefix)/bin/
\r
114 + install lib/$(SONAME) $(DESTDIR)$(prefix)/lib/
\r
115 + ln -sf $(DESTDIR)$(prefix)/lib/$(SONAME) $(DESTDIR)$(prefix)/lib/libnotmuch.so
\r
116 install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
\r
118 install-emacs: install emacs
\r
119 diff --git a/lib/Makefile.local b/lib/Makefile.local
\r
120 index 70489e1..a6462ae 100644
\r
121 --- a/lib/Makefile.local
\r
122 +++ b/lib/Makefile.local
\r
125 -extra_cflags += -I$(dir)
\r
126 +extra_cflags += -I$(dir) -fPIC
\r
128 libnotmuch_c_srcs = \
\r
130 @@ -18,8 +18,9 @@ libnotmuch_cxx_srcs = \
\r
133 libnotmuch_modules = $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)
\r
134 -$(dir)/notmuch.a: $(libnotmuch_modules)
\r
135 - $(call quiet,AR) rcs $@ $^
\r
136 +$(dir)/libnotmuch.so : $(libnotmuch_modules)
\r
137 + $(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@
\r
138 + ln -sf $(SONAME) $@
\r
140 SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
\r
141 -CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/notmuch.a
\r
142 +CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/libnotmuch.so *.so
\r