Gentoo Archives: gentoo-dev

From: Vadim Misbakh-Soloviov <mva@g.o>
To: gentoo-dev@l.g.o
Cc: sarnex@g.o, matt@×××××××××.uk, Vadim Misbakh-Soloviov <mva@g.o>
Subject: [gentoo-dev] [PATCH] eclass/tree-sitter-grammar: fix ABI autodetecton
Date: Thu, 09 Dec 2021 03:11:56
Message-Id: 20211209031042.885672-1-mva@gentoo.org
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 eclass/tree-sitter-grammar.eclass | 20 ++++++++++----------
17 1 file changed, 10 insertions(+), 10 deletions(-)
18
19 diff --git a/eclass/tree-sitter-grammar.eclass b/eclass/tree-sitter-grammar.eclass
20 index 46573027f96..939a36ccb8c 100644
21 --- a/eclass/tree-sitter-grammar.eclass
22 +++ b/eclass/tree-sitter-grammar.eclass
23 @@ -40,15 +40,13 @@ EXPORT_FUNCTIONS src_compile src_install
24 # @INTERNAL
25 # @DESCRIPTION:
26 # This internal function determines the ABI version of a grammar library based
27 -# on the package version.
28 +# on a constant in the source file.
29 _get_tsg_abi_ver() {
30 - if ver_test -gt 0.21; then
31 - die "Grammar too new; unknown ABI version"
32 - elif ver_test -ge 0.19.0; then
33 - echo 13
34 - else
35 - die "Grammar too old; unknown ABI version"
36 - fi
37 + # This sed script finds ABI definition string in parser source file,
38 + # substitutes all the string until the ABI number, and prints remains
39 + # (the ABI number itself)
40 + sed -n '/#define LANGUAGE_VERSION/s/.* //p' "${S}"/parser.c ||
41 + die "Unable to extract ABI version for this grammar"
42 }
43
44 # @FUNCTION: tree-sitter-grammar_src_compile
45 @@ -89,8 +87,10 @@ tree-sitter-grammar_src_compile() {
46 tree-sitter-grammar_src_install() {
47 debug-print-function ${FUNCNAME} "${@}"
48
49 - dolib.so "${WORKDIR}"/lib${PN}$(get_libname $(_get_tsg_abi_ver))
50 - dosym lib${PN}$(get_libname $(_get_tsg_abi_ver)) \
51 + local soname=lib${PN}$(get_libname $(_get_tsg_abi_ver))
52 +
53 + dolib.so "${WORKDIR}/${soname}"
54 + dosym "${soname}" \
55 /usr/$(get_libdir)/lib${PN}$(get_libname)
56 }
57 fi
58 --
59 2.34.1

Replies