Skip to content

Commit 178b143

Browse files
KartatzKartatz
committed
Update CMake and Autotools toolchains
1 parent 62bded0 commit 178b143

7 files changed

Lines changed: 96 additions & 98 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 28 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
id: check-cache
1818
uses: actions/cache@main
1919
with:
20-
key: gcc-15.0
20+
key: gcc-15.2.1
2121
lookup-only: true
2222
path: |
2323
/tmp/x86_64-linux-gnu.tar.xz
@@ -63,7 +63,7 @@ jobs:
6363
if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
6464
uses: actions/cache@main
6565
with:
66-
key: gcc-15.0
66+
key: gcc-15.2.1
6767
path: |
6868
/tmp/x86_64-linux-gnu.tar.xz
6969
/tmp/x86_64-linux-gnu.tar.xz.sha256
@@ -90,9 +90,9 @@ jobs:
9090
# Linux (musl)
9191
'aarch64-unknown-linux-musl',
9292
'x86_64-unknown-linux-musl',
93-
'arm-unknown-linux-musleabihf',
93+
'armv6-unknown-linux-musleabihf',
94+
'armv7-unknown-linux-musleabihf',
9495
'i386-unknown-linux-musl',
95-
'armv7l-unknown-linux-musleabihf',
9696

9797
# FreeBSD
9898
'x86_64-unknown-freebsd',
@@ -104,24 +104,13 @@ jobs:
104104
'x86_64-unknown-netbsd',
105105
'aarch64-unknown-netbsd',
106106

107-
# OpenBSD
108-
'x86_64-unknown-openbsd',
109-
'i386-unknown-openbsd',
110-
'aarch64-unknown-openbsd',
111-
'arm-unknown-openbsd',
112-
113107
# DragonFly BSD
114108
'x86_64-unknown-dragonfly',
115109

116110
# Haiku
117111
'i586-unknown-haiku',
118112
'x86_64-unknown-haiku',
119113

120-
# Serenity
121-
'x86_64-unknown-serenity',
122-
'aarch64-unknown-serenity',
123-
'riscv64-unknown-serenity',
124-
125114
# Android
126115
'x86_64-unknown-linux-android',
127116
'i686-unknown-linux-android21',
@@ -139,7 +128,7 @@ jobs:
139128
- name: Restore from cache
140129
uses: actions/cache@main
141130
with:
142-
key: gcc-15.0
131+
key: gcc-15.2.1
143132
fail-on-cache-miss: true
144133
path: |
145134
/tmp/x86_64-linux-gnu.tar.xz
@@ -152,32 +141,32 @@ jobs:
152141
run: |
153142
source './tools/setup_toolchain.sh'
154143
155-
if [[ '${{ matrix.target }}' == *'-linux-musl'* ]]; then
156-
declare -r RAIDEN_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Raiden/releases/latest')")"
144+
if [[ '${{ matrix.target }}' = *'-linux-musl'* ]]; then
145+
declare -r RAIDEN_TAG='gcc-15'
157146
declare -r RAIDEN_TARBALL='/tmp/toolchain.tar.xz'
158147
declare -r RAIDEN_URL="https://github.com/AmanoTeam/Raiden/releases/download/${RAIDEN_TAG}/x86_64-unknown-linux-gnu.tar.xz"
159148
160-
curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${RAIDEN_URL}" --output "${RAIDEN_TARBALL}"
149+
curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${RAIDEN_URL}" --output "${RAIDEN_TARBALL}"
161150
tar --directory="$(dirname "${RAIDEN_TARBALL}")" --extract --file="${RAIDEN_TARBALL}"
162151
163152
export RAIDEN_HOME='/tmp/raiden'
164153
export PATH="${RAIDEN_HOME}/bin:${PATH}"
165154
166155
source "${RAIDEN_HOME}/usr/local/share/raiden/autotools/${{ matrix.target }}.sh"
167-
elif [[ '${{ matrix.target }}' == *'-linux-gnu'* ]]; then
168-
declare -r OBGGCC_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/obggcc/releases/latest')")"
156+
elif [[ '${{ matrix.target }}' = *'-linux-gnu'* ]]; then
157+
declare -r OBGGCC_TAG='gcc-15'
169158
declare -r OBGGCC_TARBALL='/tmp/toolchain.tar.xz'
170159
declare -r OBGGCC_URL="https://github.com/AmanoTeam/obggcc/releases/download/${OBGGCC_TAG}/x86_64-unknown-linux-gnu.tar.xz"
171160
172-
curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${OBGGCC_URL}" --output "${OBGGCC_TARBALL}"
161+
curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${OBGGCC_URL}" --output "${OBGGCC_TARBALL}"
173162
tar --directory="$(dirname "${OBGGCC_TARBALL}")" --extract --file="${OBGGCC_TARBALL}"
174163
175164
export OBGGCC_HOME='/tmp/obggcc'
176165
export PATH="${OBGGCC_HOME}/bin:${PATH}"
177166
178167
source "${OBGGCC_HOME}/usr/local/share/obggcc/autotools/${{ matrix.target }}.sh"
179-
elif [[ '${{ matrix.target }}' == *'-freebsd' ]]; then
180-
declare -r LOKI_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Loki/releases/latest')")"
168+
elif [[ '${{ matrix.target }}' = *'-freebsd' ]]; then
169+
declare -r LOKI_TAG='gcc-15'
181170
declare -r LOKI_TARBALL='/tmp/toolchain.tar.xz'
182171
declare -r LOKI_URL="https://github.com/AmanoTeam/Loki/releases/download/${LOKI_TAG}/x86_64-unknown-linux-gnu.tar.xz"
183172
@@ -188,79 +177,55 @@ jobs:
188177
export PATH="${LOKI_HOME}/bin:${PATH}"
189178
190179
source "${LOKI_HOME}/usr/local/share/loki/autotools/${{ matrix.target }}.sh"
191-
elif [[ '${{ matrix.target }}' == *'-netbsd'* ]]; then
192-
declare -r DAKINI_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Dakini/releases/latest')")"
180+
elif [[ '${{ matrix.target }}' = *'-netbsd'* ]]; then
181+
declare -r DAKINI_TAG='gcc-15'
193182
declare -r DAKINI_TARBALL='/tmp/toolchain.tar.xz'
194183
declare -r DAKINI_URL="https://github.com/AmanoTeam/Dakini/releases/download/${DAKINI_TAG}/x86_64-unknown-linux-gnu.tar.xz"
195184
196-
curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${DAKINI_URL}" --output "${DAKINI_TARBALL}"
185+
curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${DAKINI_URL}" --output "${DAKINI_TARBALL}"
197186
tar --directory="$(dirname "${DAKINI_TARBALL}")" --extract --file="${DAKINI_TARBALL}"
198187
199188
export DAKINI_HOME='/tmp/dakini'
200189
export PATH="${DAKINI_HOME}/bin:${PATH}"
201190
202191
source "${DAKINI_HOME}/usr/local/share/dakini/autotools/${{ matrix.target }}.sh"
203-
elif [[ '${{ matrix.target }}' == *'-openbsd'* ]]; then
204-
declare -r ATAR_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Atar/releases/latest')")"
205-
declare -r ATAR_TARBALL='/tmp/toolchain.tar.xz'
206-
declare -r ATAR_URL="https://github.com/AmanoTeam/Atar/releases/download/${ATAR_TAG}/x86_64-unknown-linux-gnu.tar.xz"
207-
208-
curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${ATAR_URL}" --output "${ATAR_TARBALL}"
209-
tar --directory="$(dirname "${ATAR_TARBALL}")" --extract --file="${ATAR_TARBALL}"
210-
211-
export ATAR_HOME='/tmp/atar'
212-
export PATH="${ATAR_HOME}/bin:${PATH}"
213-
214-
source "${ATAR_HOME}/usr/local/share/atar/autotools/${{ matrix.target }}.sh"
215-
elif [[ '${{ matrix.target }}' == *'-dragonfly' ]]; then
216-
# declare -r VENTI_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Venti/releases/latest')")"
192+
elif [[ '${{ matrix.target }}' = *'-dragonfly' ]]; then
193+
# declare -r VENTI_TAG='gcc-15'
217194
# declare -r VENTI_TARBALL='/tmp/toolchain.tar.xz'
218195
# declare -r VENTI_URL="https://github.com/AmanoTeam/Venti/releases/download/${VENTI_TAG}/x86_64-unknown-linux-gnu.tar.xz"
219196
220-
# curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${VENTI_URL}" --output "${VENTI_TARBALL}"
197+
# curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${VENTI_URL}" --output "${VENTI_TARBALL}"
221198
# tar --directory="$(dirname "${VENTI_TARBALL}")" --extract --file="${VENTI_TARBALL}"
222199
223200
# export VENTI_HOME='/tmp/venti'
224201
export PATH="${VENTI_HOME}/bin:${PATH}"
225202
226203
source "${VENTI_HOME}/usr/local/share/venti/autotools/${{ matrix.target }}.sh"
227-
elif [[ '${{ matrix.target }}' == *'-haiku' ]]; then
228-
declare -r SIL_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Sil/releases/latest')")"
204+
elif [[ '${{ matrix.target }}' = *'-haiku' ]]; then
205+
declare -r SIL_TAG='gcc-15'
229206
declare -r SIL_TARBALL='/tmp/toolchain.tar.xz'
230207
declare -r SIL_URL="https://github.com/AmanoTeam/Sil/releases/download/${SIL_TAG}/x86_64-unknown-linux-gnu.tar.xz"
231208
232-
curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${SIL_URL}" --output "${SIL_TARBALL}"
209+
curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${SIL_URL}" --output "${SIL_TARBALL}"
233210
tar --directory="$(dirname "${SIL_TARBALL}")" --extract --file="${SIL_TARBALL}"
234211
235212
export SIL_HOME='/tmp/sil'
236213
export PATH="${SIL_HOME}/bin:${PATH}"
237214
238215
source "${SIL_HOME}/usr/local/share/sil/autotools/${{ matrix.target }}.sh"
239-
elif [[ '${{ matrix.target }}' == *'-serenity' ]]; then
240-
declare -r SENNA_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Senna/releases/latest')")"
241-
declare -r SENNA_TARBALL='/tmp/toolchain.tar.xz'
242-
declare -r SENNA_URL="https://github.com/AmanoTeam/Senna/releases/download/${SENNA_TAG}/x86_64-unknown-linux-gnu.tar.xz"
243-
244-
curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${SENNA_URL}" --output "${SENNA_TARBALL}"
245-
tar --directory="$(dirname "${SENNA_TARBALL}")" --extract --file="${SENNA_TARBALL}"
246-
247-
export SENNA_HOME='/tmp/senna'
248-
export PATH="${SENNA_HOME}/bin:${PATH}"
249-
250-
source "${SENNA_HOME}/usr/local/share/senna/autotools/${{ matrix.target }}.sh"
251-
elif [[ '${{ matrix.target }}' == *'-android'* ]]; then
252-
declare -r PINO_TAG="$(jq --raw-output '.tag_name' <<< "$(curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://api.github.com/repos/AmanoTeam/Pino/releases/latest')")"
216+
elif [[ '${{ matrix.target }}' = *'-android'* ]]; then
217+
declare -r PINO_TAG='gcc-15'
253218
declare -r PINO_TARBALL='/tmp/toolchain.tar.xz'
254219
declare -r PINO_URL="https://github.com/AmanoTeam/Pino/releases/download/${PINO_TAG}/x86_64-unknown-linux-gnu.tar.xz"
255220
256-
curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${PINO_URL}" --output "${PINO_TARBALL}"
221+
curl --show-error --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --location --url "${PINO_URL}" --output "${PINO_TARBALL}"
257222
tar --directory="$(dirname "${PINO_TARBALL}")" --extract --file="${PINO_TARBALL}"
258223
259224
export PINO_HOME='/tmp/pino'
260225
export PATH="${PINO_HOME}/bin:${PATH}"
261226
262227
source "${PINO_HOME}/usr/local/share/pino/autotools/${{ matrix.target }}.sh"
263-
elif [[ '${{ matrix.target }}' == *'-darwin' ]]; then
228+
elif [[ '${{ matrix.target }}' = *'-darwin' ]]; then
264229
curl \
265230
--silent \
266231
--show-error \
@@ -318,12 +283,12 @@ jobs:
318283
uses: softprops/action-gh-release@master
319284
with:
320285
tag_name: gcc-15
321-
name: GCC 15.2.0
286+
name: GCC 15.2.1
322287
files: ./*/*-unknown-*.tar.xz*
323288
draft: false
324289
prerelease: false
325290
fail_on_unmatched_files: true
326-
body: "* Update to GCC 15.2.0"
291+
body: "* Update to GCC 15.2.1"
327292
env:
328293
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
329294

‎README.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
# Venti
1+
# dragonfly-gcc-cross
22

3-
A GCC cross-compiler targeting DragonFly BSD 5.0.0.
3+
This is a GCC cross-compiler targeting DragonFly BSD.
44

5-
## Target architectures
5+
## releases
66

7-
* `x86_64-unknown-dragonfly`
7+
The current release is based on GCC 15 and supports cross-compiling for the `x86_64` target. The toolchain includes support for the C and C++ frontends.
88

9-
## Releases
10-
11-
You can obtain releases from the [releases](https://github.com/AmanoTeam/Venti/releases) page.
9+
You can download the prebuilt toolchains from the [releases](https://github.com/AmanoTeam/Venti/releases) page.

0 commit comments

Comments
 (0)