Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id A7F98429E2E for ; Sun, 26 Jun 2011 19:42:43 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 ZSYEhnl-OGf1 for ; Sun, 26 Jun 2011 19:42:43 -0700 (PDT) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 00ED9431FD0 for ; Sun, 26 Jun 2011 19:42:42 -0700 (PDT) Received: from zancas.localnet (fctnnbsc30w-142167176081.pppoe-dynamic.High-Speed.nb.bellaliant.net [142.167.176.81]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p5R2gbCk030272 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Sun, 26 Jun 2011 23:42:38 -0300 Received: from bremner by zancas.localnet with local (Exim 4.76) (envelope-from ) id 1Qb1mX-0007y0-Dq; Sun, 26 Jun 2011 23:42:37 -0300 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH] libnotmuch: build symbols list without relying on gcc -aux-info. Date: Sun, 26 Jun 2011 23:42:25 -0300 Message-Id: <1309142545-30590-1-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1309136932-21910-1-git-send-email-david@tethera.net> References: <1309136932-21910-1-git-send-email-david@tethera.net> Cc: David Bremner 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: Mon, 27 Jun 2011 02:42:43 -0000 From: David Bremner 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