Skip to content

Commit 5f4770f

Browse files
bors[bot]AlexhuszaghEmilgardis
authored
Merge #734 #735
734: Fix ARMv6 HF image to correctly build for ARMv6 architecture. r=Emilgardis a=Alexhuszagh Change the `arm-unknown-linux-gnueabihf` to build a toolchain using crosstool-ng, so that we build a toolchain using ARMv6 support, rather than ARMv7. This also adds support for crosstool-ng-based images, which are configured from template config files so that we can modify the GCC, glibc, and Linux versions. These are configured by running `crosstool-ng/configure.sh`, which scans that directory for all `*.config.in` files, and configures them to `docker/crosstool-config`. The script can have the toolchain versions modified via `GCC_VERSION`, `GLIBC_VERSION`, and `LINUX_VERSION`. Closes #426. 735: add issue templates r=Emilgardis a=Emilgardis resolves #732 Co-authored-by: Alex Huszagh <[email protected]> Co-authored-by: Emil Gardström <[email protected]>
3 parents 7caf557 + 5b9a77c + 5a0f30e commit 5f4770f

File tree

10 files changed

+1949
-15
lines changed

10 files changed

+1949
-15
lines changed

‎.github/ISSUE_TEMPLATE/a_blank_issue.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
name: Blank Issue
3+
about: Create a blank issue.
4+
---

‎.github/ISSUE_TEMPLATE/b_issue_report.yml

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
name: Issue report
2+
description: Report something that is broken, missing or wrong.
3+
4+
body:
5+
- type: checkboxes
6+
id: acknowledgments
7+
attributes:
8+
label: Checklist
9+
options:
10+
- label: I've looked through the [issues and pull requests](https://github.com/cross-rs/cross/issues?q=) for similar reports
11+
required: true
12+
- type: textarea
13+
id: description
14+
validations:
15+
required: true
16+
attributes:
17+
label: Describe your issue
18+
description: |
19+
Write a description of your issue. Include error messages if there are any.
20+
placeholder: |
21+
Examples:
22+
- cross no longer compiles my project after upgrade.
23+
- I have trouble doing X.
24+
- Feature X has stopped working for me.
25+
26+
- type: dropdown
27+
id: target
28+
attributes:
29+
label: What target(s) are you cross-compiling for?
30+
description: You may select more than one or none if this is not applicable (N/A).
31+
multiple: true
32+
options:
33+
- aarch64-linux-android
34+
- aarch64-unknown-linux-gnu
35+
- aarch64-unknown-linux-musl
36+
- arm-linux-androideabi
37+
- arm-unknown-linux-gnueabi
38+
- arm-unknown-linux-gnueabihf
39+
- arm-unknown-linux-musleabi
40+
- arm-unknown-linux-musleabihf
41+
- armv5te-unknown-linux-gnueabi
42+
- armv5te-unknown-linux-musleabi
43+
- armv7-linux-androideabi
44+
- armv7-unknown-linux-gnueabihf
45+
- armv7-unknown-linux-musleabihf
46+
- asmjs-unknown-emscripten
47+
- i586-unknown-linux-gnu
48+
- i586-unknown-linux-musl
49+
- i686-linux-android
50+
- i686-pc-windows-gnu
51+
- i686-unknown-freebsd
52+
- i686-unknown-linux-gnu
53+
- i686-unknown-linux-musl
54+
- mips64el-unknown-linux-gnuabi64
55+
- mips64el-unknown-linux-muslabi64
56+
- mips64-unknown-linux-gnuabi64
57+
- mips64-unknown-linux-muslabi64
58+
- mipsel-unknown-linux-gnu
59+
- mipsel-unknown-linux-musl
60+
- mips-unknown-linux-gnu
61+
- mips-unknown-linux-musl
62+
- powerpc64le-unknown-linux-gnu
63+
- powerpc64-unknown-linux-gnu
64+
- powerpc-unknown-linux-gnu
65+
- riscv64gc-unknown-linux-gnu
66+
- s390x-unknown-linux-gnu
67+
- sparc64-unknown-linux-gnu
68+
- sparcv9-sun-solaris
69+
- thumbv6m-none-eabi
70+
- thumbv7em-none-eabi
71+
- thumbv7em-none-eabihf
72+
- thumbv7m-none-eabi
73+
- wasm32-unknown-emscripten
74+
- x86_64-linux-android
75+
- x86_64-pc-windows-gnu
76+
- x86_64-sun-solaris
77+
- x86_64-unknown-freebsd
78+
- x86_64-unknown-linux-gnu
79+
- x86_64-unknown-linux-musl
80+
- x86_64-unknown-netbsd
81+
- other (specify in description)
82+
83+
- type: checkboxes
84+
id: host-system
85+
attributes:
86+
label: Which operating system is the host (e.g computer cross is on) running?
87+
description: You may select more than one or none if N/A.
88+
options:
89+
- label: macOS
90+
- label: Windows
91+
- label: Linux / BSD
92+
- label: other OS (specify in description)
93+
94+
- type: checkboxes
95+
id: host-arch
96+
attributes:
97+
label: What architecture is the host?
98+
description: You may select more than one or none if N/A.
99+
options:
100+
- label: x86_64 / AMD64
101+
- label: arm32
102+
- label: arm64 (including Mac M1)
103+
104+
- type: checkboxes
105+
id: container-engine
106+
attributes:
107+
label: What container engine is cross using?
108+
description: You may select more than one or none if N/A.
109+
options:
110+
- label: docker
111+
- label: podman
112+
- label: other container engine (specify in description)
113+
114+
- type: input
115+
id: cross-version
116+
validations:
117+
required: true
118+
attributes:
119+
label: cross version
120+
description: The version of cross given with `cross -V` or `cross --version`
121+
placeholder: cross 0.4.2 (c8df353 2025-01-01)
122+
123+
- type: textarea
124+
id: mcve
125+
attributes:
126+
label: Example
127+
description: Please provide a short, complete example of the issue if possible.
128+
placeholder: |
129+
```sh
130+
git clone https://github.com/ghost/my_mcve
131+
cross build --target x86_65-unknown-linux-gnu
132+
```
133+
134+
Gives the error message `could not discover target specification`
135+
136+
- type: textarea
137+
id: additional
138+
attributes:
139+
label: Additional information / notes
140+
description: Provide any information you think is relevant to the issue
141+
placeholder: It builds on `asmjs-unknown-emscripten`

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Question?
4+
url: https://matrix.to/#/#cross-rs:matrix.org
5+
about: Reach out to us on our Matrix room if you want!
6+
- name: Question!
7+
url: https://github.com/cross-rs/cross/discussions/categories/q-a
8+
about: Or try the Q&A discussions
9+
- name: FAQ
10+
url: https://github.com/cross-rs/cross/wiki/FAQ
11+
about: Frequently Asked Questions are compiled here.

‎.github/ISSUE_TEMPLATE/z_feature_request.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Feature Request
2+
description: Leave a feature request if you have a suggestion to improve cross and/or the rust ecosystem
3+
labels: ["feature-request"]
4+
5+
body:
6+
- type: checkboxes
7+
id: acknowledgments
8+
attributes:
9+
label: Checklist
10+
options:
11+
- label: I've looked through the [issues and pull requests](https://github.com/cross-rs/cross/issues?q=) for similar request
12+
required: true
13+
- label: This feature could be solved with a [custom docker image](https://github.com/cross-rs/cross#custom-docker-images) (optional)
14+
- type: textarea
15+
id: description
16+
validations:
17+
required: true
18+
attributes:
19+
label: Describe your request
20+
description: |
21+
Write a description of what your feature would do.
22+
If you have an idea how to solve this, feel free to leave a comment on the feature request after creating it.
23+
24+
If you have tried solved this but couldn't, explain what you tried and how or why it didn't work. We want to help!
25+
placeholder: |
26+
Examples:
27+
- cross should be able to do X.
28+
- Add more emojis to the error printing.
29+
- Implement support for cargo feature X.
30+
- type: textarea
31+
id: motivation
32+
validations:
33+
required: false
34+
attributes:
35+
label: Describe why this would be a good inclusion for `cross`
36+
description: |
37+
Why should this be added?

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
## [Unreleased]
77

8+
- #734 - patch `arm-unknown-linux-gnueabihf` to build for ARMv6, and add architecture for crosstool-ng-based images.
89
- #730 - make FreeBSD builds more resilient.
910
- #727 - add `PKG_CONFIG_PATH` to all `*-linux-gnu` images.
1011
- #725 - support `CROSS_DEBUG` and `CROSS_RUNNER` on android images.

0 commit comments

Comments
 (0)