1 Return-Path: <nate4d@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 arlo.cworth.org (Postfix) with ESMTP id E1E7F6DE0FF8
\r
6 for <notmuch@notmuchmail.org>; Tue, 30 Jun 2015 14:30:09 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.637 tagged_above=-999 required=5 tests=[AWL=0.044,
\r
12 DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001,
\r
13 RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001,
\r
14 T_FREEMAIL_FORGED_FROMDOMAIN=0.01, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01]
\r
16 Received: from arlo.cworth.org ([127.0.0.1])
\r
17 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
18 with ESMTP id 6RzuPnzHOGkF for <notmuch@notmuchmail.org>;
\r
19 Tue, 30 Jun 2015 14:30:08 -0700 (PDT)
\r
20 Received: from mail-qg0-f47.google.com (mail-qg0-f47.google.com
\r
22 by arlo.cworth.org (Postfix) with ESMTPS id 061446DE0C4A
\r
23 for <notmuch@notmuchmail.org>; Tue, 30 Jun 2015 14:30:08 -0700 (PDT)
\r
24 Received: by qgii30 with SMTP id i30so10472390qgi.1
\r
25 for <notmuch@notmuchmail.org>; Tue, 30 Jun 2015 14:30:04 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=sender:from:to:cc:subject:date:message-id:in-reply-to:references;
\r
28 bh=qfwH3tk9nY/fEwqmSbYa0i3Uzmc2XqrIZoWr5RV0U3s=;
\r
29 b=OltKWOPCfiWqrZj6t45hpMbocGdNXjeYoeWeGQ9gJz71BFxqNoRiOQCyJeW8eSsGAh
\r
30 03+qGzAxLMZTXwX+uVu45YcSKXA6suf1llv2mm81wVJDlp9B3jSWJO8mU8K6YEeGQW1G
\r
31 0mfpfmKZOdAAUS4aOi6rZhLno+BZr7X32SwPNFhpTg+fC5WNOV7JUZXSWn3p4NUa7mSR
\r
32 pq6sZpLyMhhIZEj0q1Az7H5KxdMxHgn4UOCgsuhI+GQnUDu9OsQbVBUY8XxNiGSazdzs
\r
33 z7TUwpakWWKDbqwOTojTL97Yi1Qp4k+A4xUymQj2/ZV9B/YSLQMdnoIz6QxH9/tzjkNe
\r
35 X-Received: by 10.140.237.208 with SMTP id
\r
36 i199mr30542224qhc.103.1435699804299; Tue, 30 Jun 2015 14:30:04 -0700 (PDT)
\r
37 Received: from localhost.localdomain ([50.153.173.39])
\r
38 by mx.google.com with ESMTPSA id 195sm589095qhr.13.2015.06.30.14.30.02
\r
39 (version=TLSv1 cipher=RC4-SHA bits=128/128);
\r
40 Tue, 30 Jun 2015 14:30:03 -0700 (PDT)
\r
41 Sender: Nathan Eagleson <nate4d@gmail.com>
\r
42 From: Nate Eagleson <nate@nateeag.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH] build: Support Mac OS X 10.6.8
\r
45 Date: Tue, 30 Jun 2015 17:29:07 -0400
\r
46 Message-Id: <1435699747-13591-2-git-send-email-nate@nateeag.com>
\r
47 X-Mailer: git-send-email 1.8.1.3
\r
48 In-Reply-To: <1435699747-13591-1-git-send-email-nate@nateeag.com>
\r
49 References: <1435699747-13591-1-git-send-email-nate@nateeag.com>
\r
50 X-BeenThere: notmuch@notmuchmail.org
\r
51 X-Mailman-Version: 2.1.18
\r
53 List-Id: "Use and development of the notmuch mail system."
\r
54 <notmuch.notmuchmail.org>
\r
55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
57 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
58 List-Post: <mailto:notmuch@notmuchmail.org>
\r
59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
62 X-List-Received-Date: Tue, 30 Jun 2015 21:30:10 -0000
\r
64 OS X 10.6.8 has a built-in library named libutil.dylib and a version
\r
65 of ld that picks that up instead of util/libutil.a.
\r
67 We now use an absolute path to util/libutil.a, so that notmuch can be
\r
68 built successfully on 10.6.8.
\r
70 Makefile.local | 8 +++++++-
\r
71 1 file changed, 7 insertions(+), 1 deletion(-)
\r
73 diff --git a/Makefile.local b/Makefile.local
\r
74 index 61a9c4c..c82b43a 100644
\r
75 --- a/Makefile.local
\r
76 +++ b/Makefile.local
\r
77 @@ -43,10 +43,16 @@ GPG_FILE=$(SHA1_FILE).asc
\r
79 PV_FILE=bindings/python/notmuch/version.py
\r
81 +# Mac OS X 10.6 has a built-in libutil.dylib that prevents ld from
\r
82 +# picking up notmuch's libutil.a. The best way to prefer our local
\r
83 +# libutil.a is to specify it via absolute path, which should work on
\r
84 +# all supported OSes.
\r
85 +LIBUTIL_PATH=${srcdir}/util/libutil.a
\r
87 # Smash together user's values with our extra values
\r
88 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
\r
89 FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
\r
90 -FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch
\r
91 +FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) $(LIBUTIL_PATH) -Llib -lnotmuch -Wl,-t
\r
92 ifeq ($(LIBDIR_IN_LDCONFIG),0)
\r
93 FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
\r