unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH] libnotmuch: build symbols list without relying on gcc -aux-info.
Date: Sun, 26 Jun 2011 23:42:25 -0300	[thread overview]
Message-ID: <1309142545-30590-1-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1309136932-21910-1-git-send-email-david@tethera.net>

From: David Bremner <bremner@debian.org>

Carl reports "gcc -aux-info notmuch.aux lib/notmuch.h" does not
generate notmuch.aux for him with Debian gcc 4.6.0-8.

Based on a suggestion by Austin Clements, this version uses objdump to
get the symbols from the object files.

Any symbol that

    - is in some object file in $(libnotmuch_modules), and
    - starts with notmuch_

will be exported.
---

 Here is another way of doing this, probably better unless you are
 very attached to the idea of declaring the API in the header file.
 

 lib/Makefile.local |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile.local b/lib/Makefile.local
index a33ba34..38913c6 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -75,10 +75,9 @@ $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym
 	echo $(libnotmuch_modules)
 	$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@
 
-notmuch.sym: lib/notmuch.h
-	gcc -aux-info notmuch.aux $<
+notmuch.sym: $(libnotmuch_modules)
 	printf "{\nglobal:\n" > notmuch.sym
-	sed  -n 's/.*\(notmuch_[a-z_]*\) (.*/\t\1;/p' notmuch.aux >> notmuch.sym
+	objdump -t $(libnotmuch_modules)| awk '$$4 == ".text" && $$6 ~ "^notmuch" {print "\t"$$6";"}' >>notmuch.sym
 	printf "local: *;\n};\n" >> notmuch.sym
 
 $(dir)/$(SONAME): $(dir)/$(LIBNAME)
@@ -103,4 +102,4 @@ install-$(dir): $(dir)/$(LIBNAME)
 	$(LIBRARY_INSTALL_POST_COMMAND)
 
 SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
-CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a notmuch.aux notmuch.sym
+CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a notmuch.sym
-- 
1.7.5.4

  reply	other threads:[~2011-06-27  2:42 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-27  1:08 [PATCH] libnotmuch: build symbols list without relying on gcc -aux-info david
2011-06-27  2:42 ` david [this message]
2011-06-28 19:04   ` Carl Worth
2011-06-28 19:45     ` David Bremner
2011-11-29  6:51   ` New test for exported symbols David Bremner
2011-11-29  6:51     ` [PATCH 1/2] test/symbol-hiding: add some whitespace between tests David Bremner
2011-11-29  6:51     ` [PATCH 2/2] test/symbol-hiding: compare exported symbols with existing one David Bremner
2011-12-08  0:59     ` New test for exported symbols David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1309142545-30590-1-git-send-email-david@tethera.net \
    --to=david@tethera.net \
    --cc=bremner@debian.org \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).