aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <jani@nikula.org>2017-05-10 22:42:09 +0300
committerDavid Bremner <david@tethera.net>2017-05-11 20:41:10 -0300
commitd5ed9af0e42c0f32bcababd6ac5ce42ccb1bf283 (patch)
treeea0ee9232051a1f367fa8654c5606440c72a2263
parent11d47950c18f2d19718e35b7264dabf2ff2fd621 (diff)
build: do not export compat functions from lib
Commits 9db214527213 ("lib/gen-version-script.h: add getline and getdelim to notmuch.sym if needed") and 3242e29e57ac ("build: add canonicalize_file_name to symbols exported from libnotmuch.so") started exporting compat functions from libnotmuch so that the cli could use them. But we shouldn't export such functions from the library. They are not part of our ABI. Instead, the cli should include its own copies of the compat functions.
-rw-r--r--Makefile.local1
-rw-r--r--lib/gen-version-script.sh1
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.local b/Makefile.local
index 3d3474e0..6bc78ef8 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -212,6 +212,7 @@ dataclean: distclean
rm -rf $(DATACLEAN)
notmuch_client_srcs = \
+ $(notmuch_compat_srcs) \
command-line-arguments.c\
debugger.c \
status.c \
diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh
index 5621f2a9..c98a07b0 100644
--- a/lib/gen-version-script.sh
+++ b/lib/gen-version-script.sh
@@ -24,6 +24,5 @@ while read sym; do
;;
esac
done
-nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $2 == "T" && $3 ~ "^(getline|getdelim|canonicalize_file_name)$" {print $3 ";"}'
sed -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/ \1;/p' $HEADER
printf "local: *;\n};\n"