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

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

[Matthias Guedemann]

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

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

[David Bremner]

On Tue, 30 Aug 2011 14:56:50 +0200, Matthias Guedemann <matthias.guedemann@googlemail.com> wrote:
> 
> 
> 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.
> 

Hi Matthias (and any other BSD folk);

I pushed modified versions of your two patches to branch "openbsd-nm" at

	git://git.notmuchmail.org/git/notmuch 

Can you let me know if my version of the patches is OK on OpenBSD?

d

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

[matthias.guedemann]

Hi David,

> Can you let me know if my version of the patches is OK on OpenBSD?

yes it works well on OpenBSD5.0-current, thanks a lot,

Matthias

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

[David Bremner]

On Mon, 05 Sep 2011 09:43:37 +0200, matthias.guedemann@googlemail.com wrote:
> > Can you let me know if my version of the patches is OK on OpenBSD?
> 
> yes it works well on OpenBSD5.0-current, thanks a lot,

OK, I pushed a slightly modified version to master, hopefully I didn't
break it when tidying the regex.

d