From 515325d1d047fe01fe2a62ac3576382a8a54a568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Barto=C5=88?= Date: Wed, 28 Aug 2024 15:09:19 +0200 Subject: [PATCH] Update cross-compilation toolchain to the new upstream packages --- .github/workflows/mingw-cross-toolchain.yml | 69 +++++++++++---------- build.sh | 18 +++--- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/.github/workflows/mingw-cross-toolchain.yml b/.github/workflows/mingw-cross-toolchain.yml index 38df232..fafa839 100644 --- a/.github/workflows/mingw-cross-toolchain.yml +++ b/.github/workflows/mingw-cross-toolchain.yml @@ -19,33 +19,39 @@ on: value: ${{ toJson(jobs) }} jobs: - mingw-w64-cross-headers: + mingw-w64-cross-mingwarm64-headers: uses: ./.github/workflows/build-package.yml with: - package_name: mingw-w64-cross-headers + package_name: mingw-w64-cross-mingwarm64-headers packages_repository: Windows-on-ARM-Experiments/MSYS2-packages packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }} - mingw-w64-cross-binutils: - needs: mingw-w64-cross-headers + mingw-w64-cross-mingwarm64-binutils: + needs: mingw-w64-cross-mingwarm64-headers uses: ./.github/workflows/build-package.yml with: - package_name: mingw-w64-cross-binutils + package_name: mingw-w64-cross-mingwarm64-binutils needs: ${{ toJson(needs) }} packages_repository: Windows-on-ARM-Experiments/MSYS2-packages packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }} - mingw-w64-cross-gcc-stage1: - needs: [mingw-w64-cross-headers, mingw-w64-cross-binutils] + mingw-w64-cross-mingwarm64-gcc-stage1: + needs: [ + mingw-w64-cross-mingwarm64-headers, + mingw-w64-cross-mingwarm64-binutils + ] uses: ./.github/workflows/build-package.yml with: - package_name: mingw-w64-cross-gcc-stage1 + package_name: mingw-w64-cross-mingwarm64-gcc-stage1 needs: ${{ toJson(needs) }} packages_repository: Windows-on-ARM-Experiments/MSYS2-packages packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }} mingw-w64-cross-windows-default-manifest: - needs: [mingw-w64-cross-binutils, mingw-w64-cross-gcc-stage1] + needs: [ + mingw-w64-cross-mingwarm64-binutils, + mingw-w64-cross-mingwarm64-gcc-stage1 + ] uses: ./.github/workflows/build-package.yml with: package_name: mingw-w64-cross-windows-default-manifest @@ -54,12 +60,11 @@ jobs: packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }} mingw-w64-cross-crt: - needs: - [ - mingw-w64-cross-headers, - mingw-w64-cross-binutils, - mingw-w64-cross-gcc-stage1 - ] + needs: [ + mingw-w64-cross-mingwarm64-headers, + mingw-w64-cross-mingwarm64-binutils, + mingw-w64-cross-mingwarm64-gcc-stage1 + ] uses: ./.github/workflows/build-package.yml with: package_name: mingw-w64-cross-crt @@ -69,13 +74,12 @@ jobs: packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }} mingw-w64-cross-winpthreads: - needs: - [ - mingw-w64-cross-headers, - mingw-w64-cross-binutils, - mingw-w64-cross-gcc-stage1, - mingw-w64-cross-crt - ] + needs: [ + mingw-w64-cross-mingwarm64-headers, + mingw-w64-cross-mingwarm64-binutils, + mingw-w64-cross-mingwarm64-gcc-stage1, + mingw-w64-cross-crt + ] uses: ./.github/workflows/build-package.yml with: package_name: mingw-w64-cross-winpthreads @@ -84,15 +88,14 @@ jobs: packages_branch: ${{ github.event.inputs.msys2_packages_branch || 'woarm64' }} mingw-w64-cross-gcc: - needs: - [ - mingw-w64-cross-headers, - mingw-w64-cross-binutils, - mingw-w64-cross-gcc-stage1, - mingw-w64-cross-windows-default-manifest, - mingw-w64-cross-crt, - mingw-w64-cross-winpthreads - ] + needs: [ + mingw-w64-cross-mingwarm64-headers, + mingw-w64-cross-mingwarm64-binutils, + mingw-w64-cross-mingwarm64-gcc-stage1, + mingw-w64-cross-windows-default-manifest, + mingw-w64-cross-crt, + mingw-w64-cross-winpthreads + ] uses: ./.github/workflows/build-package.yml with: package_name: mingw-w64-cross-gcc @@ -102,8 +105,8 @@ jobs: mingw-w64-cross-zlib: needs: [ - mingw-w64-cross-headers, - mingw-w64-cross-binutils, + mingw-w64-cross-mingwarm64-headers, + mingw-w64-cross-mingwarm64-binutils, mingw-w64-cross-windows-default-manifest, mingw-w64-cross-crt, mingw-w64-cross-winpthreads, diff --git a/build.sh b/build.sh index 055c908..2ed12a1 100644 --- a/build.sh +++ b/build.sh @@ -14,26 +14,26 @@ pacman -R --noconfirm mingw-w64-cross-gcc || true pacman -R --noconfirm mingw-w64-cross-winpthreads || true pacman -R --noconfirm mingw-w64-cross-crt || true pacman -R --noconfirm mingw-w64-cross-windows-default-manifest || true -pacman -R --noconfirm mingw-w64-cross-gcc-stage1 || true -pacman -R --noconfirm mingw-w64-cross-binutils || true -pacman -R --noconfirm mingw-w64-cross-headers || true +pacman -R --noconfirm mingw-w64-cross-mingwarm64-gcc-stage1 || true +pacman -R --noconfirm mingw-w64-cross-mingwarm64-binutils || true +pacman -R --noconfirm mingw-w64-cross-mingwarm64-headers || true pacman -S --noconfirm base-devel -echo "::group::Build mingw-w64-cross-headers" - pushd ../MSYS2-packages/mingw-w64-cross-headers +echo "::group::Build mingw-w64-cross-mingwarm64-headers" + pushd ../MSYS2-packages/mingw-w64-cross-mingwarm64-headers makepkg $MAKEPKG_OPTIONS popd echo "::endgroup::" -echo "::group::Build mingw-w64-cross-binutils" - pushd ../MSYS2-packages/mingw-w64-cross-binutils +echo "::group::Build mingw-w64-cross-mingwarm64-binutils" + pushd ../MSYS2-packages/mingw-w64-cross-mingwarm64-binutils makepkg $MAKEPKG_OPTIONS popd echo "::endgroup::" -echo "::group::Build mingw-w64-cross-gcc-stage1" - pushd ../MSYS2-packages/mingw-w64-cross-gcc-stage1 +echo "::group::Build mingw-w64-cross-mingwarm64-gcc-stage1" + pushd ../MSYS2-packages/mingw-w64-cross-mingwarm64-gcc-stage1 makepkg $MAKEPKG_OPTIONS popd echo "::endgroup::"