From d5ed9af0e42c0f32bcababd6ac5ce42ccb1bf283 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Wed, 10 May 2017 22:42:09 +0300 Subject: [PATCH] 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. --- Makefile.local | 1 + lib/gen-version-script.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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" -- 2.26.2