* [gentoo-dev] [PATCH] eclass/tree-sitter-grammar: fix ABI autodetecton
@ 2021-12-09 3:10 99% Vadim Misbakh-Soloviov
0 siblings, 0 replies; 1+ results
From: Vadim Misbakh-Soloviov @ 2021-12-09 3:10 UTC (permalink / raw
To: gentoo-dev; +Cc: sarnex, matt, Vadim Misbakh-Soloviov
Some grammars packages (like, for example, tree-sitter-agda) uses
different versioning scheme from vast majority of grammars in
tree-sitter github organization.
Also, third-party grammars doesn't follow tree-sitter versioning.
Also, some grammars (like tree-sitter-haskell, for example) only had
old release tagged, but having compatible and useful grammars in
current HEAD.
Also, some grammars like tree-sitter-verilog, even have only v0.0 tag.
So, instead of assuming grammar ABI version based on ${PV} (ver_test)
we decided to take ABI version drectly from source code.
---
eclass/tree-sitter-grammar.eclass | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/tree-sitter-grammar.eclass b/eclass/tree-sitter-grammar.eclass
index 46573027f96..939a36ccb8c 100644
--- a/eclass/tree-sitter-grammar.eclass
+++ b/eclass/tree-sitter-grammar.eclass
@@ -40,15 +40,13 @@ EXPORT_FUNCTIONS src_compile src_install
# @INTERNAL
# @DESCRIPTION:
# This internal function determines the ABI version of a grammar library based
-# on the package version.
+# on a constant in the source file.
_get_tsg_abi_ver() {
- if ver_test -gt 0.21; then
- die "Grammar too new; unknown ABI version"
- elif ver_test -ge 0.19.0; then
- echo 13
- else
- die "Grammar too old; unknown ABI version"
- fi
+ # This sed script finds ABI definition string in parser source file,
+ # substitutes all the string until the ABI number, and prints remains
+ # (the ABI number itself)
+ sed -n '/#define LANGUAGE_VERSION/s/.* //p' "${S}"/parser.c ||
+ die "Unable to extract ABI version for this grammar"
}
# @FUNCTION: tree-sitter-grammar_src_compile
@@ -89,8 +87,10 @@ tree-sitter-grammar_src_compile() {
tree-sitter-grammar_src_install() {
debug-print-function ${FUNCNAME} "${@}"
- dolib.so "${WORKDIR}"/lib${PN}$(get_libname $(_get_tsg_abi_ver))
- dosym lib${PN}$(get_libname $(_get_tsg_abi_ver)) \
+ local soname=lib${PN}$(get_libname $(_get_tsg_abi_ver))
+
+ dolib.so "${WORKDIR}/${soname}"
+ dosym "${soname}" \
/usr/$(get_libdir)/lib${PN}$(get_libname)
}
fi
--
2.34.1
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-12-09 3:10 99% [gentoo-dev] [PATCH] eclass/tree-sitter-grammar: fix ABI autodetecton Vadim Misbakh-Soloviov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox