From nobody Wed Sep 10 09:45:42 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cMG5g22KRz67Mpd; Wed, 10 Sep 2025 09:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cMG5g1GDRz3XdQ; Wed, 10 Sep 2025 09:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757497543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0e+Z0fM8n8prTxaAY0ap9Y/LnnuThwOAEdnaH8B3gY=; b=huIjMIl3lqwk7us6iGh7t/4PSzAM9RcqCx80iQt8Bvviy7d4k4WJtMeBzgBCm/3zdWhbnb DV5So05IQPa9SABnKzqoprAoW3Qy3xEhVAp3w67EyUQJRfOSs9jo8SIDT+qhNnOFDixoUC zn4pdGRNZJA+aqwjspKCrs+psZwlhuF+jXn1mCDR0hm8rjT4QxhaCknQE5DMA5n6UU2tAH Lyr5xWtRHC5PyvwXXIHqxLeGt9lpIgOIfin17V23KMVz4aEBBLpT1+12Hrpwp1xz6Tq3Vk 7OAUh5iLJ9S4N+w2aenFtYVtgMVG0t5GZXdk40ayQu/0KxJKmjj4r1jUYZbJ/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757497543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0e+Z0fM8n8prTxaAY0ap9Y/LnnuThwOAEdnaH8B3gY=; b=dBxkyKblsszd3iR24GIGsHD/CTWnFskhlhOi6vJJAMPCq/1UWi4mJsO0kQtCqBZRq36WS6 jWcMA8tXQeO0PQkQFJEKsZTwtUzRzC94cd4IvkU0iQgyfV2A1+FHo7bmcEsEBh7Mzb0Oio 31hZRvHQ9NajKTSnPtsSIxsbXqUypjrAXoBMpElp7hBiA5O2zu659R+2nxP2njj814TWpg Qk5ihC0A6d/mXGOYpq4KRuHWjEv/wRTm4d+XkFJ2VjggP9MG+kjsN0ByThFAY4doaqPibs skdCmgQ9eh0oQTr8RyuuMft/d0fXD8hzm9dB7qszC/RU3qtmG+T/naxBXrW8yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757497543; a=rsa-sha256; cv=none; b=uAR1sG7goZXTSun2C4twROdU+HrCAIrNrZyzkqIs6EqHotgvIe08E5EOMh1QiTmgQE4+8d BTHUg57gIPub31hU/84gMJuJL+2n970I192DG64VGrvpuVxe2v0sMSamn/1TvfWzbsQqzU u3m01DfLegDMcMjZNYeIctzEjgW75mmQu5D5IWb32TDA+8yiICtYVTfgPebBsK6bQdRr4Y OwhWL6fuR+E3Zi+heHGMAH5FTJqliG8Za/HM5nh7wyMfHslQHASkdPDHo9O7GsspiMMNRC J0M0faPTSS0sC2Mc+ZQ0ALX4GlOVs8Mx5Uw/H9i5xo1l1v0oSgKv8Lz6t9RgrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cMG5g0QfNz1ct; Wed, 10 Sep 2025 09:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58A9jgBf052776; Wed, 10 Sep 2025 09:45:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58A9jgrL052773; Wed, 10 Sep 2025 09:45:42 GMT (envelope-from git) Date: Wed, 10 Sep 2025 09:45:42 GMT Message-Id: <202509100945.58A9jgrL052773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: f57ee6874d46 - main - textproc/tree-sitter-grammars: Fix build with BUILD_AS_NON_ROOT=yes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f57ee6874d4635f71f775449dafb172547b4ee23 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=f57ee6874d4635f71f775449dafb172547b4ee23 commit f57ee6874d4635f71f775449dafb172547b4ee23 Author: Mikael Urankar AuthorDate: 2025-09-07 09:06:53 +0000 Commit: Mikael Urankar CommitDate: 2025-09-10 09:45:36 +0000 textproc/tree-sitter-grammars: Fix build with BUILD_AS_NON_ROOT=yes PR: 289260 --- textproc/tree-sitter-grammars/Makefile | 4 ++++ textproc/tree-sitter-grammars/files/patch-src_main.rs | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/textproc/tree-sitter-grammars/Makefile b/textproc/tree-sitter-grammars/Makefile index 586c9ea4c669..c2aec35d5499 100644 --- a/textproc/tree-sitter-grammars/Makefile +++ b/textproc/tree-sitter-grammars/Makefile @@ -60,6 +60,10 @@ post-extract: ${CP} ${DISTDIR}/${LANG_HASH}/languages.toml ${WRKSRC} +post-patch: + ${REINPLACE_CMD} "s#WRKDIR#${WRKDIR}#" \ + ${WRKSRC}/src/main.rs + post-build: cd ${WRKSRC}; \ ${CARGO_TARGET_DIR}/release/build-tree-sitter --output ./output --tmp ${WRKSRC}/grammars diff --git a/textproc/tree-sitter-grammars/files/patch-src_main.rs b/textproc/tree-sitter-grammars/files/patch-src_main.rs index 4197c86a3f26..ea6c62211292 100644 --- a/textproc/tree-sitter-grammars/files/patch-src_main.rs +++ b/textproc/tree-sitter-grammars/files/patch-src_main.rs @@ -31,3 +31,11 @@ let path = if let Some(subpath) = grammar.source.subpath.as_ref() { path.join(subpath) } else { +@@ -171,6 +171,7 @@ fn build_tree_sitter(name: &str, path: &Path, output: + fn build_tree_sitter(name: &str, path: &Path, output: &Path) -> Result<()> { + println!("-----------------------------------"); + println!("now building tree sitter for {name}"); ++ std::env::set_var("XDG_CACHE_HOME", "WRKDIR/.cache"); + let output = Command::new("tree-sitter") + .current_dir(path) + .arg("build")