From 845fd0ad8e960ea5ca7cb74d5dbd1f88b7476286 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 26 Mar 2022 18:20:46 +0100
Subject: [PATCH] tree-sitter, enable build for 32bit, fix install paths
 (#6748)

---
 dev-libs/treesitter/treesitter-0.20.6.recipe | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev-libs/treesitter/treesitter-0.20.6.recipe b/dev-libs/treesitter/treesitter-0.20.6.recipe
index e5d220128..b821c8d96 100644
--- a/dev-libs/treesitter/treesitter-0.20.6.recipe
+++ b/dev-libs/treesitter/treesitter-0.20.6.recipe
@@ -1,16 +1,15 @@
 SUMMARY="An incremental parsing system for programming tools"
-DESCRIPTION="Tree-sitter is an extendable parsing system for
-various programming tools."
+DESCRIPTION="Tree-sitter is an extendable parsing system for various programming tools."
 HOMEPAGE="https://tree-sitter.github.io/"
 COPYRIGHT="2018-2021 Max Brunsfeld"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v$portVersion.tar.gz"
 CHECKSUM_SHA256="4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de"
 SOURCE_DIR="tree-sitter-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	treesitter$secondaryArchSuffix = $portVersion
@@ -20,6 +19,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
 PROVIDES_devel="
 	treesitter${secondaryArchSuffix}_devel
 	devel:libtree_sitter$secondaryArchSuffix
@@ -27,6 +27,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	treesitter$secondaryArchSuffix == $portVersion base
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -47,13 +48,10 @@ BUILD()
 
 INSTALL()
 {
-	make PREFIX=$prefix install
+	make PREFIX=$prefix INCLUDEDIR=$includeDir \
+		LIBDIR=$libDir install
 
-	install -Dm 755 target/release/tree-sitter -t $binDir
-
-	mkdir -p $developDir/headers
-	mv $prefix/include/* $developDir/headers
-	rm -rf $prefix/include
+	install -Dm 755 target/release/tree-sitter -t $prefix/bin
 
 	prepareInstalledDevelLib libtree-sitter
 	fixPkgconfig