[PATCH 1/4] Use C++ compiler to link notmuch binaries

diff --git a/d6/fa29c8950f7a12747426da541257099d151aa1 b/d6/fa29c8950f7a12747426da541257099d151aa1
new file mode 100644 (file)
index 0000000..5fe1925
--- /dev/null
+++ b/d6/fa29c8950f7a12747426da541257099d151aa1
@@ -0,0 +1,92 @@
+Return-Path: <aaronecay@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 olra.theworths.org (Postfix) with ESMTP id A4C124196F2\r
+       for <notmuch@notmuchmail.org>; Sun, 11 Apr 2010 16:45:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.999\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.999 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+       DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001]\r
+       autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id LdjrAr3C8HFc for <notmuch@notmuchmail.org>;\r
+       Sun, 11 Apr 2010 16:45:00 -0700 (PDT)\r
+Received: from qw-out-1920.google.com (qw-out-1920.google.com [74.125.92.148])\r
+       by olra.theworths.org (Postfix) with ESMTP id DFA2E431FC1\r
+       for <notmuch@notmuchmail.org>; Sun, 11 Apr 2010 16:44:59 -0700 (PDT)\r
+Received: by qw-out-1920.google.com with SMTP id 5so1634849qwc.32\r
+       for <notmuch@notmuchmail.org>; Sun, 11 Apr 2010 16:44:59 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=domainkey-signature:received:received:from:to:subject:date\r
+       :message-id:x-mailer:in-reply-to:references;\r
+       bh=dMakOge8o1T0VbQOIRbM0MZ5isiZhWBPCpbYhH1uMyw=;\r
+       b=BalmiYVP/TrpcSyTgclfiGVs5if88B/c4wWLVr640nXrhPC6oIhWaACMLgheem/itG\r
+       4ObyHzB+aWQVbUqj/pWmGG5Fg0tgYHt2gk4bE1rNeK7YehtB4znjOibSPFUPfJK7MovG\r
+       wh1NOJ1Y8w58wErdy4njk5tELYj2PNoUj72fM=\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
+       h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       b=NYjYnnhg/JfZPv7zICsun/vySTELhL+U2ngHDPgJskBs2XgQeDS1Tk1MdJvI6xaIF9\r
+       Qgdww+lnEw9aQYz7EdrPuOR18H/2jHjK+HHD93Xcfx6XtPbGdqJ6Pzd7Gext+TnUbyfZ\r
+       2nnR3AS1UZMAtnLpuKdKVcUrru77EU5OHJpJk=\r
+Received: by 10.224.17.161 with SMTP id s33mr1149802qaa.267.1271029499403;\r
+       Sun, 11 Apr 2010 16:44:59 -0700 (PDT)\r
+Received: from localhost.localdomain (vpm120.wireless-resnet.upenn.edu\r
+       [165.123.236.140])\r
+       by mx.google.com with ESMTPS id 8sm7425346qwj.50.2010.04.11.16.44.58\r
+       (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
+       Sun, 11 Apr 2010 16:44:59 -0700 (PDT)\r
+From: Aaron Ecay <aaronecay@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4] Use C++ compiler to link notmuch binaries\r
+Date: Sun, 11 Apr 2010 19:44:51 -0400\r
+Message-Id: <1271029494-89014-1-git-send-email-aaronecay@gmail.com>\r
+X-Mailer: git-send-email 1.7.0.4\r
+In-Reply-To: <4bc25ea0.86c3f10a.45a3.ffff80d3@mx.google.com>\r
+References: <4bc25ea0.86c3f10a.45a3.ffff80d3@mx.google.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Sun, 11 Apr 2010 23:45:00 -0000\r
+\r
+Since the binaries contain C++ code, it is necessary to use the C++\r
+linker, or errors result on some platforms (OS X).\r
+\r
+Signed-off-by: Aaron Ecay <aaronecay@gmail.com>\r
+---\r
+ Makefile.local |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 71525e2..9e753cd 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -216,10 +216,10 @@ notmuch_client_srcs =            \\r
+ notmuch_client_modules = $(notmuch_client_srcs:.c=.o)\r
+ \r
+ notmuch: $(notmuch_client_modules) lib/libnotmuch.a\r
+-      $(call quiet,CC $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@\r
++      $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@\r
+ \r
+ notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so\r
+-      $(call quiet,CC $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@\r
++      $(call quiet,CXX $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@\r
+ \r
+ notmuch.1.gz: notmuch.1\r
+       gzip --stdout $^ > $@\r
+-- \r
+1.7.0.4\r
+\r