[PATCH] Support OpenBSD

diff --git a/1a/285c0dc76148cb1e4f983973f2761403a15fef b/1a/285c0dc76148cb1e4f983973f2761403a15fef
new file mode 100644 (file)
index 0000000..c8f4617
--- /dev/null
+++ b/1a/285c0dc76148cb1e4f983973f2761403a15fef
@@ -0,0 +1,121 @@
+Return-Path: <amdragon@mit.edu>\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 CAC12431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Oct 2012 14:43:36 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 6yymJE4CSQxL for <notmuch@notmuchmail.org>;\r
+       Wed, 24 Oct 2012 14:43:34 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id A2DF1431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Oct 2012 14:43:34 -0700 (PDT)\r
+X-AuditID: 12074422-b7f746d0000008cc-2b-50886106cb51\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 5F.76.02252.60168805; Wed, 24 Oct 2012 17:43:34 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q9OLhWxq001246; \r
+       Wed, 24 Oct 2012 17:43:32 -0400\r
+Received: from drake.dyndns.org (26-4-181.dynamic.csail.mit.edu [18.26.4.181])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q9OLhUX4010203\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Wed, 24 Oct 2012 17:43:31 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TR8ja-0005sR-MK; Wed, 24 Oct 2012 17:43:30 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Support OpenBSD\r
+Date: Wed, 24 Oct 2012 17:43:28 -0400\r
+Message-Id: <1351115008-22531-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsUixCmqrMuW2BFg8GmrgMX1mzOZHRg9nq26\r
+       xRzAGMVlk5Kak1mWWqRvl8CVsWDBFqaCr7wVi//qNjDu5O5i5OSQEDCRaGhcyQZhi0lcuLce\r
+       zBYS2Mco8ftVUBcjF5C9gVHiydL1TBDOKSaJZ6tfQlXNZZS48KoIxGYT0JDYtn85I4gtIiAt\r
+       sfPubFYQm1nAVmJvz2/mLkYODmEBBYmFZ3RBwiwCqhIHtzeBlfMKOEgc+vKbHeIIeYmn9/vY\r
+       JjDyLmBkWMUom5JbpZubmJlTnJqsW5ycmJeXWqRrqpebWaKXmlK6iREUAOwuSjsYfx5UOsQo\r
+       wMGoxMN7wKMjQIg1say4MvcQoyQHk5Io7+Q4oBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3skP\r
+       2gOEeFMSK6tSi/JhUtIcLErivNdSbvoLCaQnlqRmp6YWpBbBZGU4OJQkeJsTgIYKFqWmp1ak\r
+       ZeaUIKSZODhBhvMADe8GWcxbXJCYW5yZDpE/xajLceLj3IeMQix5+XmpUuK87PFARQIgRRml\r
+       eXBzYJH7ilEc6C1h3kCQdTzAqIeb9ApoCRPQEnOeVpAlJYkIKakGxvnX7GwVCkxfylW/2Pbp\r
+       S8raPKuIBz4XZC2eOiSofrXwrG3wDz79qqigq5Zzt8H0vJXL77L5mQhlOu68YemdV3p79u+n\r
+       l3OZDt9K9HGoXW46JfWc0e6UNaFzo2oq9OxyNm155zzX0z332tzrU7uEV+7fyjljCeO+jcLs\r
+       fUb1PUJX4ktb1vAyKrEUZyQaajEXFScCAPnxkb+3AgAA\r
+Cc: ccutler@csail.mit.edu\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: Wed, 24 Oct 2012 21:43:36 -0000\r
+\r
+OpenBSD's build flags are identical to FreeBSD, except that libraries\r
+need to be explicitly linked against libc.  No code changes are\r
+necessary.\r
+\r
+From: Cody Cutler <ccutler@csail.mit.edu>\r
+---\r
+ configure          |    6 +++++-\r
+ lib/Makefile.local |    3 +++\r
+ 2 files changed, 8 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/configure b/configure\r
+index acb90a8..232d847 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -378,6 +378,10 @@ elif [ $uname = "FreeBSD" ] ; then\r
+     printf "FreeBSD.\n"\r
+     platform=FREEBSD\r
+     linker_resolves_library_dependencies=0\r
++elif [ $uname = "OpenBSD" ] ; then\r
++    printf "OpenBSD.\n"\r
++    platform=OPENBSD\r
++    linker_resolves_library_dependencies=0\r
+ elif [ $uname = "Linux" ] || [ $uname = "GNU" ] ; then\r
+     printf "$uname\n"\r
+     platform="$uname"\r
+@@ -667,7 +671,7 @@ HAVE_GETLINE = ${have_getline}\r
+ # build its own version)\r
+ HAVE_STRCASESTR = ${have_strcasestr}\r
+ \r
+-# Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD\r
++# Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD\r
+ PLATFORM = ${platform}\r
+ \r
+ # Whether the linker will automatically resolve the dependency of one\r
+diff --git a/lib/Makefile.local b/lib/Makefile.local\r
+index 8a9aa28..34e998f 100644\r
+--- a/lib/Makefile.local\r
++++ b/lib/Makefile.local\r
+@@ -31,6 +31,9 @@ LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)\r
+ SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR)\r
+ LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)\r
+ LIBRARY_LINK_FLAG = -shared -Wl,--version-script=notmuch.sym,-soname=$(SONAME) -Wl,--no-undefined\r
++ifeq ($(PLATFORM),OPENBSD)\r
++LIBRARY_LINK_FLAG += -lc\r
++endif\r
+ ifeq ($(LIBDIR_IN_LDCONFIG),1)\r
+ ifeq ($(DESTDIR),)\r
+ LIBRARY_INSTALL_POST_COMMAND=ldconfig\r
+-- \r
+1.7.10\r
+\r