From: gbrlsnchs <gbrlsnchs@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] tree-sitter: build and install tree-sitter CLI.
Date: Mon, 08 Mar 2021 21:50:56 +0100 [thread overview]
Message-ID: <20210308205056.F3zht668iR95qb1GxYeSMqjDf7dlZWURRkpxImpAp0I@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29272@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]
There is an updated pull request by gbrlsnchs against master on the void-packages repository
https://github.com/gbrlsnchs/void-packages tree-sitter
https://github.com/void-linux/void-packages/pull/29272
tree-sitter: build and install tree-sitter CLI.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29272.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tree-sitter-29272.patch --]
[-- Type: text/x-diff, Size: 2971 bytes --]
From ef1c1a8099ea52d4a3b89581f648e6391fb9289d Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 8 Mar 2021 17:47:17 -0300
Subject: [PATCH 1/2] tree-sitter: update to 0.19.2.
---
common/shlibs | 2 +-
srcpkgs/tree-sitter/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a911b3892cb..f17eadcd60e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3964,4 +3964,4 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
libsimavr.so.1 simavr-1.6_2
libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
-libtree-sitter.so.0 tree-sitter-0.19.0_1
+libtree-sitter.so.0 tree-sitter-0.19.2_1
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index e3218d9b444..fc1d074a5aa 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -1,6 +1,6 @@
# Template file for 'tree-sitter'
pkgname=tree-sitter
-version=0.19.0
+version=0.19.2
revision=1
build_style=gnu-makefile
short_desc="Parser generator tool and incremental parsing library"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://tree-sitter.github.io"
distfiles="https://github.com/tree-sitter/${pkgname}/archive/v${version}.tar.gz"
-checksum=7fa56a76b29b170ae11026a5c965e5a1177c158e251bec103d353ffff16a84e9
+checksum=c1b0eace3264799a5b55415bfb8a17ef064ea086205e5e842d47df2296812fe9
post_install() {
vlicense LICENSE
From c0620e609999d12a8b91714d917744f6d9ccfe7c Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Sat, 6 Mar 2021 14:56:08 -0300
Subject: [PATCH 2/2] tree-sitter: package the CLI.
---
srcpkgs/tree-sitter/template | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index fc1d074a5aa..e28860f90a7 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -2,7 +2,8 @@
pkgname=tree-sitter
version=0.19.2
revision=1
-build_style=gnu-makefile
+build_style=cargo
+make_install_args="--path=cli"
short_desc="Parser generator tool and incremental parsing library"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
@@ -10,7 +11,15 @@ homepage="https://tree-sitter.github.io"
distfiles="https://github.com/tree-sitter/${pkgname}/archive/v${version}.tar.gz"
checksum=c1b0eace3264799a5b55415bfb8a17ef064ea086205e5e842d47df2296812fe9
+post_build() {
+ # Build libtree-sitter, since do_build builds the tree-sitter CLI.
+ make
+}
+
post_install() {
+ # Install libtree-sitter, since do_install installs the tree-sitter CLI.
+ make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
+
vlicense LICENSE
}
@@ -18,6 +27,7 @@ tree-sitter-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
+ vmove usr/bin
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
next prev parent reply other threads:[~2021-03-08 20:50 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-06 17:58 [PR PATCH] " gbrlsnchs
2021-03-07 21:33 ` ericonr
2021-03-07 21:38 ` ericonr
2021-03-08 0:06 ` gbrlsnchs
2021-03-08 0:34 ` ericonr
2021-03-08 0:45 ` gbrlsnchs
2021-03-08 2:27 ` ericonr
2021-03-08 14:26 ` gbrlsnchs
2021-03-08 14:27 ` gbrlsnchs
2021-03-08 14:27 ` gbrlsnchs
2021-03-08 15:13 ` ericonr
2021-03-08 17:50 ` gbrlsnchs
2021-03-08 18:27 ` ericonr
2021-03-08 18:27 ` ericonr
2021-03-08 18:49 ` gbrlsnchs
2021-03-08 18:55 ` FollieHiyuki
2021-03-08 19:03 ` ericonr
2021-03-08 20:50 ` gbrlsnchs [this message]
2021-03-08 20:51 ` [PR PATCH] [Updated] " gbrlsnchs
2021-03-08 20:53 ` gbrlsnchs
2021-03-08 20:56 ` gbrlsnchs
2021-03-08 22:52 ` ericonr
2021-03-09 0:31 ` gbrlsnchs
2021-03-09 0:39 ` ericonr
2021-03-09 0:39 ` ericonr
2021-03-09 1:02 ` gbrlsnchs
2021-03-09 1:06 ` [PR PATCH] [Updated] " gbrlsnchs
2021-03-09 8:51 ` FollieHiyuki
2021-03-15 23:48 ` [PR PATCH] [Closed]: " ericonr
2021-03-15 23:48 ` ericonr
2021-03-15 23:55 ` gbrlsnchs
2021-03-16 0:10 ` ericonr
2021-03-16 0:11 ` ericonr
2021-03-16 13:40 ` gbrlsnchs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308205056.F3zht668iR95qb1GxYeSMqjDf7dlZWURRkpxImpAp0I@z \
--to=gbrlsnchs@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).