[PATCH] build: Support Mac OS X 10.6.8

diff --git a/4f/b44c864b1b6445bbb558a24f3deb4672bd4d47 b/4f/b44c864b1b6445bbb558a24f3deb4672bd4d47
new file mode 100644 (file)
index 0000000..87f8bcf
--- /dev/null
+++ b/4f/b44c864b1b6445bbb558a24f3deb4672bd4d47
@@ -0,0 +1,97 @@
+Return-Path: <nate4d@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id E1E7F6DE0FF8\r
+ for <notmuch@notmuchmail.org>; Tue, 30 Jun 2015 14:30:09 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.637\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.637 tagged_above=-999 required=5 tests=[AWL=0.044,\r
+  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001,\r
+ T_FREEMAIL_FORGED_FROMDOMAIN=0.01, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 6RzuPnzHOGkF for <notmuch@notmuchmail.org>;\r
+ Tue, 30 Jun 2015 14:30:08 -0700 (PDT)\r
+Received: from mail-qg0-f47.google.com (mail-qg0-f47.google.com\r
+ [209.85.192.47])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 061446DE0C4A\r
+ for <notmuch@notmuchmail.org>; Tue, 30 Jun 2015 14:30:08 -0700 (PDT)\r
+Received: by qgii30 with SMTP id i30so10472390qgi.1\r
+ for <notmuch@notmuchmail.org>; Tue, 30 Jun 2015 14:30:04 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=sender:from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=qfwH3tk9nY/fEwqmSbYa0i3Uzmc2XqrIZoWr5RV0U3s=;\r
+ b=OltKWOPCfiWqrZj6t45hpMbocGdNXjeYoeWeGQ9gJz71BFxqNoRiOQCyJeW8eSsGAh\r
+ 03+qGzAxLMZTXwX+uVu45YcSKXA6suf1llv2mm81wVJDlp9B3jSWJO8mU8K6YEeGQW1G\r
+ 0mfpfmKZOdAAUS4aOi6rZhLno+BZr7X32SwPNFhpTg+fC5WNOV7JUZXSWn3p4NUa7mSR\r
+ pq6sZpLyMhhIZEj0q1Az7H5KxdMxHgn4UOCgsuhI+GQnUDu9OsQbVBUY8XxNiGSazdzs\r
+ z7TUwpakWWKDbqwOTojTL97Yi1Qp4k+A4xUymQj2/ZV9B/YSLQMdnoIz6QxH9/tzjkNe\r
+ rK1Q==\r
+X-Received: by 10.140.237.208 with SMTP id\r
+ i199mr30542224qhc.103.1435699804299;  Tue, 30 Jun 2015 14:30:04 -0700 (PDT)\r
+Received: from localhost.localdomain ([50.153.173.39])\r
+ by mx.google.com with ESMTPSA id 195sm589095qhr.13.2015.06.30.14.30.02\r
+ (version=TLSv1 cipher=RC4-SHA bits=128/128);\r
+ Tue, 30 Jun 2015 14:30:03 -0700 (PDT)\r
+Sender: Nathan Eagleson <nate4d@gmail.com>\r
+From: Nate Eagleson <nate@nateeag.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] build: Support Mac OS X 10.6.8\r
+Date: Tue, 30 Jun 2015 17:29:07 -0400\r
+Message-Id: <1435699747-13591-2-git-send-email-nate@nateeag.com>\r
+X-Mailer: git-send-email 1.8.1.3\r
+In-Reply-To: <1435699747-13591-1-git-send-email-nate@nateeag.com>\r
+References: <1435699747-13591-1-git-send-email-nate@nateeag.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 30 Jun 2015 21:30:10 -0000\r
+\r
+OS X 10.6.8 has a built-in library named libutil.dylib and a version\r
+of ld that picks that up instead of util/libutil.a.\r
+\r
+We now use an absolute path to util/libutil.a, so that notmuch can be\r
+built successfully on 10.6.8.\r
+---\r
+ Makefile.local | 8 +++++++-\r
+ 1 file changed, 7 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 61a9c4c..c82b43a 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -43,10 +43,16 @@ GPG_FILE=$(SHA1_FILE).asc\r
+ \r
+ PV_FILE=bindings/python/notmuch/version.py\r
+ \r
++# Mac OS X 10.6 has a built-in libutil.dylib that prevents ld from\r
++# picking up notmuch's libutil.a. The best way to prefer our local\r
++# libutil.a is to specify it via absolute path, which should work on\r
++# all supported OSes.\r
++LIBUTIL_PATH=${srcdir}/util/libutil.a\r
++\r
+ # Smash together user's values with our extra values\r
+ FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)\r
+ FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)\r
+-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch\r
++FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) $(LIBUTIL_PATH) -Llib -lnotmuch -Wl,-t\r
+ ifeq ($(LIBDIR_IN_LDCONFIG),0)\r
+ FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)\r
+ endif\r
+-- \r
+1.8.1.3\r
+\r