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