1a/285c0dc76148cb1e4f983973f2761403a15fef

   1 Return-Path: <amdragon@mit.edu>\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 CAC12431FAF\r
   6         for <notmuch@notmuchmail.org>; Wed, 24 Oct 2012 14:43:36 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 6yymJE4CSQxL for <notmuch@notmuchmail.org>;\r
  16         Wed, 24 Oct 2012 14:43:34 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
  18         [18.7.68.34])\r
  19         by olra.theworths.org (Postfix) with ESMTP id A2DF1431FAE\r
  20         for <notmuch@notmuchmail.org>; Wed, 24 Oct 2012 14:43:34 -0700 (PDT)\r
  21 X-AuditID: 12074422-b7f746d0000008cc-2b-50886106cb51\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 5F.76.02252.60168805; Wed, 24 Oct 2012 17:43:34 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q9OLhWxq001246; \r
  27         Wed, 24 Oct 2012 17:43:32 -0400\r
  28 Received: from drake.dyndns.org (26-4-181.dynamic.csail.mit.edu [18.26.4.181])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q9OLhUX4010203\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Wed, 24 Oct 2012 17:43:31 -0400 (EDT)\r
  34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1TR8ja-0005sR-MK; Wed, 24 Oct 2012 17:43:30 -0400\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH] Support OpenBSD\r
  40 Date: Wed, 24 Oct 2012 17:43:28 -0400\r
  41 Message-Id: <1351115008-22531-1-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.10\r
  43 X-Brightmail-Tracker:\r
  44  H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsUixCmqrMuW2BFg8GmrgMX1mzOZHRg9nq26\r
  45         xRzAGMVlk5Kak1mWWqRvl8CVsWDBFqaCr7wVi//qNjDu5O5i5OSQEDCRaGhcyQZhi0lcuLce\r
  46         zBYS2Mco8ftVUBcjF5C9gVHiydL1TBDOKSaJZ6tfQlXNZZS48KoIxGYT0JDYtn85I4gtIiAt\r
  47         sfPubFYQm1nAVmJvz2/mLkYODmEBBYmFZ3RBwiwCqhIHtzeBlfMKOEgc+vKbHeIIeYmn9/vY\r
  48         JjDyLmBkWMUom5JbpZubmJlTnJqsW5ycmJeXWqRrqpebWaKXmlK6iREUAOwuSjsYfx5UOsQo\r
  49         wMGoxMN7wKMjQIg1say4MvcQoyQHk5Io7+Q4oBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3skP\r
  50         2gOEeFMSK6tSi/JhUtIcLErivNdSbvoLCaQnlqRmp6YWpBbBZGU4OJQkeJsTgIYKFqWmp1ak\r
  51         ZeaUIKSZODhBhvMADe8GWcxbXJCYW5yZDpE/xajLceLj3IeMQix5+XmpUuK87PFARQIgRRml\r
  52         eXBzYJH7ilEc6C1h3kCQdTzAqIeb9ApoCRPQEnOeVpAlJYkIKakGxvnX7GwVCkxfylW/2Pbp\r
  53         S8raPKuIBz4XZC2eOiSofrXwrG3wDz79qqigq5Zzt8H0vJXL77L5mQhlOu68YemdV3p79u+n\r
  54         l3OZDt9K9HGoXW46JfWc0e6UNaFzo2oq9OxyNm155zzX0z332tzrU7uEV+7fyjljCeO+jcLs\r
  55         fUb1PUJX4ktb1vAyKrEUZyQaajEXFScCAPnxkb+3AgAA\r
  56 Cc: ccutler@csail.mit.edu\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Wed, 24 Oct 2012 21:43:36 -0000\r
  70 \r
  71 OpenBSD's build flags are identical to FreeBSD, except that libraries\r
  72 need to be explicitly linked against libc.  No code changes are\r
  73 necessary.\r
  74 \r
  75 From: Cody Cutler <ccutler@csail.mit.edu>\r
  76 ---\r
  77  configure          |    6 +++++-\r
  78  lib/Makefile.local |    3 +++\r
  79  2 files changed, 8 insertions(+), 1 deletion(-)\r
  80 \r
  81 diff --git a/configure b/configure\r
  82 index acb90a8..232d847 100755\r
  83 --- a/configure\r
  84 +++ b/configure\r
  85 @@ -378,6 +378,10 @@ elif [ $uname = "FreeBSD" ] ; then\r
  86      printf "FreeBSD.\n"\r
  87      platform=FREEBSD\r
  88      linker_resolves_library_dependencies=0\r
  89 +elif [ $uname = "OpenBSD" ] ; then\r
  90 +    printf "OpenBSD.\n"\r
  91 +    platform=OPENBSD\r
  92 +    linker_resolves_library_dependencies=0\r
  93  elif [ $uname = "Linux" ] || [ $uname = "GNU" ] ; then\r
  94      printf "$uname\n"\r
  95      platform="$uname"\r
  96 @@ -667,7 +671,7 @@ HAVE_GETLINE = ${have_getline}\r
  97  # build its own version)\r
  98  HAVE_STRCASESTR = ${have_strcasestr}\r
  99  \r
 100 -# Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD\r
 101 +# Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD\r
 102  PLATFORM = ${platform}\r
 103  \r
 104  # Whether the linker will automatically resolve the dependency of one\r
 105 diff --git a/lib/Makefile.local b/lib/Makefile.local\r
 106 index 8a9aa28..34e998f 100644\r
 107 --- a/lib/Makefile.local\r
 108 +++ b/lib/Makefile.local\r
 109 @@ -31,6 +31,9 @@ LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)\r
 110  SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR)\r
 111  LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)\r
 112  LIBRARY_LINK_FLAG = -shared -Wl,--version-script=notmuch.sym,-soname=$(SONAME) -Wl,--no-undefined\r
 113 +ifeq ($(PLATFORM),OPENBSD)\r
 114 +LIBRARY_LINK_FLAG += -lc\r
 115 +endif\r
 116  ifeq ($(LIBDIR_IN_LDCONFIG),1)\r
 117  ifeq ($(DESTDIR),)\r
 118  LIBRARY_INSTALL_POST_COMMAND=ldconfig\r
 119 -- \r
 120 1.7.10\r
 121 \r