1 Return-Path: <tom.prince@ualberta.net>
\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 0CC8B429E21
\r
6 for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 09:05:12 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 pDG0QwJNSUDV for <notmuch@notmuchmail.org>;
\r
16 Sun, 13 Nov 2011 09:05:11 -0800 (PST)
\r
17 Received: from socrates.hocat.ca (socrates.hocat.ca [76.10.188.53])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 7CAA2431FB6
\r
19 for <notmuch@notmuchmail.org>; Sun, 13 Nov 2011 09:05:11 -0800 (PST)
\r
20 Received: from hermes.hocat.ca (hermes.hocat.ca [69.165.170.253])
\r
21 by socrates.hocat.ca (Postfix) with SMTP id 683D21801;
\r
22 Sun, 13 Nov 2011 10:05:07 -0700 (MST)
\r
23 Received: (nullmailer pid 4237 invoked by uid 1000);
\r
24 Sun, 13 Nov 2011 17:05:05 -0000
\r
25 From: Tom Prince <tom.prince@ualberta.net>
\r
26 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
27 Subject: [PATCH] Link libutil using filenmae, rather than using -l.
\r
28 Date: Sun, 13 Nov 2011 12:05:03 -0500
\r
29 Message-Id: <1321203903-4201-1-git-send-email-tom.prince@ualberta.net>
\r
30 X-Mailer: git-send-email 1.7.6.1
\r
31 In-Reply-To: <87bosgasm5.fsf@hermes.hocat.ca>
\r
32 References: <87bosgasm5.fsf@hermes.hocat.ca>
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.13
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Sun, 13 Nov 2011 17:05:12 -0000
\r
47 glibc includes a libutil, so if the wrong -L options get passed, we
\r
48 will pick up glibc's version, rather than our own.
\r
50 lib/Makefile.local | 2 +-
\r
51 1 files changed, 1 insertions(+), 1 deletions(-)
\r
53 diff --git a/lib/Makefile.local b/lib/Makefile.local
\r
54 index cb53781..54c4dea 100644
\r
55 --- a/lib/Makefile.local
\r
56 +++ b/lib/Makefile.local
\r
57 @@ -70,7 +70,7 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
\r
58 $(call quiet,AR) rcs $@ $^
\r
60 $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym
\r
61 - $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ -L$(srcdir)/util -lutil
\r
62 + $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libutil.a
\r
64 notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules)
\r
65 sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@
\r