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