unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH] adds getline and getdelim to notmuch.sym if not provided by OS
@ 2011-08-30 12:56 Matthias Guedemann
  2011-09-05  3:28 ` David Bremner
  0 siblings, 1 reply; 4+ messages in thread
From: Matthias Guedemann @ 2011-08-30 12:56 UTC (permalink / raw)
  To: notmuch


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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] adds getline and getdelim to notmuch.sym if not provided by OS
  2011-08-30 12:56 [PATCH] adds getline and getdelim to notmuch.sym if not provided by OS Matthias Guedemann
@ 2011-09-05  3:28 ` David Bremner
  2011-09-05  7:43   ` matthias.guedemann
  0 siblings, 1 reply; 4+ messages in thread
From: David Bremner @ 2011-09-05  3:28 UTC (permalink / raw)
  To: Matthias Guedemann, notmuch

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] adds getline and getdelim to notmuch.sym if not provided by OS
  2011-09-05  3:28 ` David Bremner
@ 2011-09-05  7:43   ` matthias.guedemann
  2011-09-05 10:51     ` David Bremner
  0 siblings, 1 reply; 4+ messages in thread
From: matthias.guedemann @ 2011-09-05  7:43 UTC (permalink / raw)
  To: David Bremner, public-notmuch-gxuj+Tv9EO5zyzON3hdc1g




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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] adds getline and getdelim to notmuch.sym if not provided by OS
  2011-09-05  7:43   ` matthias.guedemann
@ 2011-09-05 10:51     ` David Bremner
  0 siblings, 0 replies; 4+ messages in thread
From: David Bremner @ 2011-09-05 10:51 UTC (permalink / raw)
  To: matthias.guedemann, notmuch

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-09-05 10:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-30 12:56 [PATCH] adds getline and getdelim to notmuch.sym if not provided by OS Matthias Guedemann
2011-09-05  3:28 ` David Bremner
2011-09-05  7:43   ` matthias.guedemann
2011-09-05 10:51     ` David Bremner

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).