Gentoo Archives: gentoo-dev

From: Vadim Misbakh-Soloviov <mva@g.o>
To: gentoo-dev@l.g.o
Cc: sarnex@g.o, matt@×××××××××.uk
Subject: [gentoo-dev] [PATCH] eclass/tree-sitter-grammar: fix ABI autodetecton
Date: Thu, 09 Dec 2021 16:27:41
Message-Id: 20211209162730.146929-1-mva@gentoo.org
In Reply to: Re: [gentoo-dev] [PATCH] eclass/tree-sitter-grammar: fix ABI autodetecton by "Michał Górny"
1 Some grammars packages (like, for example, tree-sitter-agda) uses
2 different versioning scheme from vast majority of grammars in
3 tree-sitter github organization.
4
5 Also, third-party grammars doesn't follow tree-sitter versioning.
6
7 Also, some grammars (like tree-sitter-haskell, for example) only had
8 old release tagged, but having compatible and useful grammars in
9 current HEAD.
10
11 Also, some grammars like tree-sitter-verilog, even have only v0.0 tag.
12
13 So, instead of assuming grammar ABI version based on ${PV} (ver_test)
14 we decided to take ABI version drectly from source code.
15
16 Signed-off-by: Vadim Misbakh-Soloviov <mva@g.o>
17 ---
18 Changes since previous commit: applied @mgorny's suggestion about sed
19 script.
20
21 eclass/tree-sitter-grammar.eclass | 20 ++++++++++----------
22 1 file changed, 10 insertions(+), 10 deletions(-)
23
24 diff --git a/eclass/tree-sitter-grammar.eclass b/eclass/tree-sitter-grammar.eclass
25 index 46573027f96..7207ecf3ddd 100644
26 --- a/eclass/tree-sitter-grammar.eclass
27 +++ b/eclass/tree-sitter-grammar.eclass
28 @@ -40,15 +40,13 @@ EXPORT_FUNCTIONS src_compile src_install
29 # @INTERNAL
30 # @DESCRIPTION:
31 # This internal function determines the ABI version of a grammar library based
32 -# on the package version.
33 +# on a constant in the source file.
34 _get_tsg_abi_ver() {
35 - if ver_test -gt 0.21; then
36 - die "Grammar too new; unknown ABI version"
37 - elif ver_test -ge 0.19.0; then
38 - echo 13
39 - else
40 - die "Grammar too old; unknown ABI version"
41 - fi
42 + # This sed script finds ABI definition string in parser source file,
43 + # substitutes all the string until the ABI number, and prints remains
44 + # (the ABI number itself)
45 + sed -n 's/#define LANGUAGE_VERSION //p' "${S}"/parser.c ||
46 + die "Unable to extract ABI version for this grammar"
47 }
48
49 # @FUNCTION: tree-sitter-grammar_src_compile
50 @@ -89,8 +87,10 @@ tree-sitter-grammar_src_compile() {
51 tree-sitter-grammar_src_install() {
52 debug-print-function ${FUNCNAME} "${@}"
53
54 - dolib.so "${WORKDIR}"/lib${PN}$(get_libname $(_get_tsg_abi_ver))
55 - dosym lib${PN}$(get_libname $(_get_tsg_abi_ver)) \
56 + local soname=lib${PN}$(get_libname $(_get_tsg_abi_ver))
57 +
58 + dolib.so "${WORKDIR}/${soname}"
59 + dosym "${soname}" \
60 /usr/$(get_libdir)/lib${PN}$(get_libname)
61 }
62 fi
63 --
64 2.34.1

Replies

Subject Author
Re: [gentoo-dev] [PATCH] eclass/tree-sitter-grammar: fix ABI autodetecton "Vadim A. Misbakh-Soloviov" <mva@g.o>