[PATCH] adds getline and getdelim to notmuch.sym if not provided by OS

diff --git a/8d/e3e11ee40ecaba2f780e46981e8d71cb1aa8cb b/8d/e3e11ee40ecaba2f780e46981e8d71cb1aa8cb
new file mode 100644 (file)
index 0000000..0e2daa4
--- /dev/null
+++ b/8d/e3e11ee40ecaba2f780e46981e8d71cb1aa8cb
@@ -0,0 +1,91 @@
+Return-Path: <matthias.guedemann@googlemail.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 8D6F6429E30\r
+       for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 05:56:54 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 mnUxMeJHA32V for <notmuch@notmuchmail.org>;\r
+       Tue, 30 Aug 2011 05:56:54 -0700 (PDT)\r
+Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B6F5D429E28\r
+       for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 05:56:53 -0700 (PDT)\r
+Received: by bkd1 with SMTP id 1so5547909bkd.26\r
+       for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 05:56:52 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=googlemail.com; s=gamma;\r
+       h=from:to:subject:user-agent:date:message-id:mime-version\r
+       :content-type; bh=z2VquYbasry2ODQG84t96HjaF6jMcH/gAYPoU5L16uk=;\r
+       b=X6uw6+kK4L/T977G/1nFekgPOibT7Y43Rmou15xmcx7uTyPU7TJ7SSU8r/Ye8XBIBn\r
+       ls50FG1yW8W/lkRLv9Wy7Zrv3RUSDd8cpMAnb5cYkcCGFDspsIj2JcEdOD5SaSAx1tfc\r
+       S0+TOmKL3luK7AbJYLfkkTMl5L7ZrZ6dQubJA=\r
+Received: by 10.204.148.77 with SMTP id o13mr83640bkv.51.1314709012491;\r
+       Tue, 30 Aug 2011 05:56:52 -0700 (PDT)\r
+Received: from localhost (pc44es141.cs.uni-magdeburg.de [141.44.32.169])\r
+       by mx.google.com with ESMTPS id a3sm16372bkd.2.2011.08.30.05.56.51\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Tue, 30 Aug 2011 05:56:51 -0700 (PDT)\r
+From: Matthias Guedemann <matthias.guedemann@googlemail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] adds getline and getdelim to notmuch.sym if not provided by\r
+ OS\r
+User-Agent: Notmuch/0.7-47-ga9e04d3 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 30 Aug 2011 14:56:50 +0200\r
+Message-ID: <87k49v12i5.fsf@pc44es141.cs.uni-magdeburg.de>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Tue, 30 Aug 2011 12:56:54 -0000\r
+\r
+\r
+not hopefully a correctly formatted patch for:\r
+\r
+OpenBSD does not provide the getline function. This is correctly\r
+detected in the configure script, but the version script only emits the\r
+Xapian*Error and notmuch_... symbols leading to undefined symbol errors\r
+for getline and getdelim.\r
+\r
+Therefore this adds two lines to gen-version-script.sh to also emit\r
+getline and getdelim if needed, tested on OpenBSD 5.0-current and Debian\r
+on current git head.\r
+\r
+---\r
+ lib/gen-version-script.sh |    2 ++\r
+ 1 files changed, 2 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh\r
+index f71afec..3ee9c69 100644\r
+--- a/lib/gen-version-script.sh\r
++++ b/lib/gen-version-script.sh\r
+@@ -23,5 +23,7 @@ while read sym; do\r
+            ;;\r
+     esac\r
+ done\r
++nm $* | grep "^[0-f][0-f]*.*T" | awk '$3 ~ "getline" {print $3 ";"}'\r
++nm $* | grep "^[0-f][0-f]*.*T" | awk '$3 ~ "getdelim" {print $3 ";"}'\r
+ sed  -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/ \1;/p' $HEADER\r
+ printf "local: *;\n};\n"\r
+-- \r
+1.7.5.4\r