From: Blake Jones <blakej@foo.net>
To: notmuch@notmuchmail.org
Cc: Blake Jones <blakej@foo.net>
Subject: [PATCH 07/10] gen-version-script: parse Solaris "nm" output (Solaris support)
Date: Sat, 3 Nov 2012 20:15:59 -0700 [thread overview]
Message-ID: <1351998962-25135-8-git-send-email-blakej@foo.net> (raw)
In-Reply-To: <1351998962-25135-1-git-send-email-blakej@foo.net>
The output of "nm" on Solaris is substantially different from that on
Linux, and the current version of gen-version-script is tied to the
Linux "nm" output. This patch separates the parts of "nm" processing
which are dependent on the output format into a couple shell functions,
and makes another shell function to use the appropriate version of
"c++filt" to demangle symbols. It also modifies lib/Makefile.local
to pass the generated symbol table correctly to the Solaris linker.
---
lib/Makefile.local | 4 ++++
lib/gen-version-script.sh | 50 ++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/lib/Makefile.local b/lib/Makefile.local
index 0c6b258..2068e4a 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -30,7 +30,11 @@ LIBRARY_SUFFIX = so
LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR)
LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
+ifeq ($(PLATFORM),SOLARIS)
+LIBRARY_LINK_FLAG = -shared -Wl,-M notmuch.sym -Wl,-soname=$(SONAME) -Wl,--no-undefined -lc
+else
LIBRARY_LINK_FLAG = -shared -Wl,--version-script=notmuch.sym,-soname=$(SONAME) -Wl,--no-undefined
+endif
ifeq ($(PLATFORM),OPENBSD)
LIBRARY_LINK_FLAG += -lc
endif
diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh
index 76670d5..d7d96da 100644
--- a/lib/gen-version-script.sh
+++ b/lib/gen-version-script.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
# we go through a bit of work to get the unmangled names of the
# typeinfo symbols because of
@@ -11,10 +12,44 @@ fi
HEADER=$1
shift
+if [ `uname -s` == SunOS ] ; then
+ #
+ # Using Solaris "nm", a defined symbol looks like this:
+ #
+ # [Index] Value Size Type Bind Other Shndx Name
+ # [15] | 128| 16|FUNC |GLOB |0 |1 |notmuch_tags_get
+ #
+ # and an undefined symbol looks like this:
+ #
+ # [Index] Value Size Type Bind Other Shndx Name
+ # [35] | 0| 0|NOTY |GLOB |0 |UNDEF |notmuch_tags_get
+ #
+ find_xapian_error() {
+ nawk -F'\|' '$7 !~ "UNDEF" && $8 ~ "Xapian.*Error" { print $8 }'
+ }
+ find_compat_syms() {
+ nawk -F'\|' '$7 !~ "UNDEF" && $8 ~ "get(line|delim)" { print $8 ";" }'
+ }
+ demangle() {
+ gc++filt "$@"
+ }
+else
+ find_xapian_error() {
+ awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $3 ~ "Xapian.*Error" {print $3}'
+ }
+ find_compat_syms() {
+ awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $2 == "T" && $3 ~ "^get(line|delim)$" {print $3 ";"}'
+ }
+ demangle() {
+ c++filt "$@"
+ }
+fi
+
printf '{\nglobal:\n'
-nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \
-while read sym; do
- demangled=$(c++filt $sym)
+
+# Find the typeinfo for "Xapian::*Error"s.
+nm $* | find_xapian_error | sort | uniq | while read sym; do
+ demangled=$(demangle $sym)
case $demangled in
typeinfo*)
printf "\t$sym;\n"
@@ -23,6 +58,11 @@ while read sym; do
;;
esac
done
-nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $2 == "T" && $3 ~ "^get(line|delim)$" {print $3 ";"}'
-sed -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/ \1;/p' $HEADER
+
+# Find the "compat" syms that we need to export.
+nm $* | find_compat_syms
+
+# Finally, get the real notmuch symbols.
+sed -n 's/^[ ]*\(notmuch_[a-z_]*\)[ ]*(.*/ \1;/p' $HEADER
+
printf "local: *;\n};\n"
--
1.7.9.2
next prev parent reply other threads:[~2012-11-04 3:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-04 3:15 [PATCH 00/10] Solaris support Blake Jones
2012-11-04 3:15 ` [PATCH 01/10] getpwuid: check for standards compliance (Solaris support) Blake Jones
2012-11-04 3:15 ` [PATCH 02/10] asctime: " Blake Jones
2012-11-04 3:15 ` [PATCH 03/10] gethostbyname: check for libnsl " Blake Jones
2012-11-04 3:15 ` [PATCH 04/10] configure: check for -Wl,-rpath " Blake Jones
2012-11-04 3:15 ` [PATCH 05/10] install: check for non-SysV version " Blake Jones
2012-11-04 21:31 ` Jani Nikula
2012-11-05 5:27 ` Blake Jones
2012-11-05 11:29 ` Jani Nikula
2012-11-05 14:52 ` Blake Jones
2012-11-04 3:15 ` [PATCH 06/10] strsep: check for availability " Blake Jones
2012-11-04 3:15 ` Blake Jones [this message]
2012-11-04 3:16 ` [PATCH 08/10] notmuch-config: header for index() prototype " Blake Jones
2012-11-04 21:16 ` Jani Nikula
2012-11-04 21:47 ` Tomi Ollila
2012-11-05 4:52 ` Blake Jones
2012-11-04 3:16 ` [PATCH 09/10] debugger.c: correct return type from getppid() " Blake Jones
2012-11-04 3:16 ` [PATCH 10/10] timegm: add portable implementation " Blake Jones
2012-11-04 10:21 ` Jani Nikula
2012-11-04 15:40 ` Blake Jones
2012-11-04 20:58 ` Jani Nikula
2012-11-05 4:50 ` Blake Jones
2012-11-05 12:09 ` Tomi Ollila
2012-11-05 15:47 ` Blake Jones
2012-11-05 17:36 ` Tomi Ollila
2012-11-05 18:33 ` Blake Jones
2012-11-04 21:35 ` [PATCH 00/10] Solaris support Jani Nikula
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=1351998962-25135-8-git-send-email-blakej@foo.net \
--to=blakej@foo.net \
--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).