1 Return-Path: <matthias.guedemann@googlemail.com>
\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 BF0E0429E30
\r
6 for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 02:27:57 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 4X1A4jYzdVBX for <notmuch@notmuchmail.org>;
\r
17 Tue, 30 Aug 2011 02:27:57 -0700 (PDT)
\r
18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com
\r
19 [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 2259B429E28
\r
22 for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 02:27:56 -0700 (PDT)
\r
23 Received: by bkd1 with SMTP id 1so5407080bkd.26
\r
24 for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 02:27:55 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=googlemail.com; s=gamma;
\r
27 h=from:to:subject:user-agent:date:message-id:mime-version
\r
28 :content-type; bh=JVbaVC09+BmFJdEGZbB4WL9UcEKAeIpamZ/PG5Ynrwk=;
\r
29 b=NeqViZT+03a2mKc90eEHp1jxtpx0BeCQdfXehbuUqWnEEXMfHQVn3XItzDO65qIqaA
\r
30 m7yZL7X50l5pKXzxwTop+uSTtnnlDowdKZLqdK47pbN2H5FYqbUzudJ5e9+RZGyT9/S7
\r
31 Xq9KfAuYQMrIJcQTfR5Vzt7nsduuKhKeBB4nw=
\r
32 Received: by 10.204.137.193 with SMTP id x1mr2825327bkt.215.1314696475675;
\r
33 Tue, 30 Aug 2011 02:27:55 -0700 (PDT)
\r
34 Received: from localhost (pc44es141.cs.uni-magdeburg.de [141.44.32.169])
\r
35 by mx.google.com with ESMTPS id o12sm838725bkj.9.2011.08.30.02.27.55
\r
36 (version=TLSv1/SSLv3 cipher=OTHER);
\r
37 Tue, 30 Aug 2011 02:27:55 -0700 (PDT)
\r
38 From: Matthias Guedemann <matthias.guedemann@googlemail.com>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: add "getline" and "getdelim" to notmuch.sym on systems lacking it
\r
41 User-Agent: Notmuch/0.7-47-ga9e04d3 (http://notmuchmail.org) Emacs/23.3.1
\r
42 (x86_64-pc-linux-gnu)
\r
43 Date: Tue, 30 Aug 2011 11:27:54 +0200
\r
44 Message-ID: <87y5yb1c6d.fsf@pc44es141.cs.uni-magdeburg.de>
\r
46 Content-Type: text/plain; charset=us-ascii
\r
47 X-BeenThere: notmuch@notmuchmail.org
\r
48 X-Mailman-Version: 2.1.13
\r
50 List-Id: "Use and development of the notmuch mail system."
\r
51 <notmuch.notmuchmail.org>
\r
52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
55 List-Post: <mailto:notmuch@notmuchmail.org>
\r
56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
59 X-List-Received-Date: Tue, 30 Aug 2011 09:27:57 -0000
\r
63 OpenBSD does not provide the getline function. This is correctly
\r
64 detected in the configure script, but the version script only emits the
\r
65 Xapian*Error and notmuch_... symbols leading to undefined symbol errors
\r
66 for getline and getdelim.
\r
68 Therefore I added two lines to gen-version-script.sh to also emit
\r
69 getline and getdelim if needed, tested on OpenBSD 5.0-current and Debian
\r
70 on current git head.
\r
76 diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh
\r
77 index f71afec..d21a723 100644
\r
78 --- a/lib/gen-version-script.sh
\r
79 +++ b/lib/gen-version-script.sh
\r
80 @@ -23,5 +23,7 @@ while read sym; do
\r
84 +nm $* | grep "^[0-f][0-f]*.*T" | awk '$3 ~ "getline" {print $3 ";"}'
\r
85 +nm $* | grep "^[0-f][0-f]*.*T" | awk '$3 ~ "getdelim" {print $3 ";"}'
\r
86 sed -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/ \1;/p' $HEADER
\r
87 printf "local: *;\n};\n"
\r