[PATCH 1/4] build: do not export compat functions from lib

Subject: [PATCH 1/4] build: do not export compat functions from lib

Date: Sun, 23 Apr 2017 20:01:55 -0000

To: notmuch@notmuchmail.org

Cc:

From: Jani Nikula

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 3d3474e0c97e..6bc78ef8e969 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 5621f2a9fd85..c98a07b0c701 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.11.0

Thread: