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.

diff --git a/Makefile.local b/Makefile.local
index 3d3474e0c97e213358862e671dd009a4600c536c..6bc78ef8e969b2d8649d68de6b590e8ded886cec 100644 (file)
--- 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 5621f2a9fd85d35feaa7985898a2a67f5fe9ee51..c98a07b0c701e70f4963c17c63c42a19de2e6cf0 100644 (file)
--- 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"