Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] tree-sitter: fix cross
@ 2022-03-02 13:05 paper42
  2022-03-02 13:13 ` [PR PATCH] [Merged]: " paper42
  0 siblings, 1 reply; 2+ messages in thread
From: paper42 @ 2022-03-02 13:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages tree-sitter-cross
https://github.com/void-linux/void-packages/pull/35922

tree-sitter: fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/35922.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tree-sitter-cross-35922.patch --]
[-- Type: text/x-diff, Size: 1006 bytes --]

From 5b751fe9c4c3ffc2bd81605025a52cacfbef8a15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 2 Mar 2022 14:02:04 +0100
Subject: [PATCH] tree-sitter: fix cross

---
 srcpkgs/tree-sitter/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index 27f0c59e1036..aae7b848d6ec 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -11,7 +11,11 @@ homepage="https://tree-sitter.github.io"
 distfiles="https://github.com/tree-sitter/tree-sitter/archive/v${version}.tar.gz"
 checksum=2a0445f8172bbf83db005aedb4e893d394e2b7b33251badd3c94c2c5cc37c403
 make_check=no # tests require generating fixtures from remote repositories
-nocross=yes # fails with current rust
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_build() {
 	# Build libtree-sitter, since do_build builds the tree-sitter CLI.

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: tree-sitter: fix cross
  2022-03-02 13:05 [PR PATCH] tree-sitter: fix cross paper42
@ 2022-03-02 13:13 ` paper42
  0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-03-02 13:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]

There's a merged pull request on the void-packages repository

tree-sitter: fix cross
https://github.com/void-linux/void-packages/pull/35922

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-03-02 13:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-02 13:05 [PR PATCH] tree-sitter: fix cross paper42
2022-03-02 13:13 ` [PR PATCH] [Merged]: " paper42

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).