Skip to content

Commit c534fe0

Browse files
messensemessense
authored
Merge pull request #23 from messense/target-alias
Update to crosstool-ng 1.25.0 and add target alias
2 parents a8c8338 + 9b344ff commit c534fe0

File tree

13 files changed

+212
-206
lines changed

13 files changed

+212
-206
lines changed

‎.github/workflows/Build.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,23 @@ jobs:
2525
- armv7-unknown-linux-musleabihf
2626
- arm-unknown-linux-gnueabi
2727
- arm-unknown-linux-gnueabihf
28+
- arm-unknown-linux-musleabihf
2829
steps:
29-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
3031
- name: Install crosstool-ng
3132
run: |
32-
brew install coreutils
33-
brew install --HEAD crosstool-ng
33+
brew install coreutils crosstool-ng
3434
- name: Mount volumes
3535
run: |
36+
set -ex
3637
hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 16g -volname build build.dmg
3738
hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 1g -volname tools tools.dmg
3839
hdiutil attach build.dmg.sparseimage
3940
hdiutil attach tools.dmg.sparseimage
4041
ls /Volumes
4142
- name: Build Toolchain
4243
run: |
44+
set -ex
4345
mkdir /Volumes/build/src
4446
cd ${{ matrix.target }}
4547
ct-ng build -j $(($(nproc) - 1))
@@ -48,16 +50,18 @@ jobs:
4850
run: tail -n 500 ${{ matrix.target }}/build.log
4951
- name: Archive Toolchain
5052
run: |
53+
set -ex
5154
cd /Volumes/tools
5255
tar czf ${{ matrix.target }}-x86_64-darwin.tar.gz ${{ matrix.target }}
5356
cd -
5457
mv /Volumes/tools/${{ matrix.target }}-x86_64-darwin.tar.gz .
5558
sha256sum ${{ matrix.target }}-x86_64-darwin.tar.gz | tee ${{ matrix.target }}-x86_64-darwin.tar.gz.sha256
5659
- name: Upload Toolchain
57-
uses: actions/upload-artifact@v2
60+
uses: actions/upload-artifact@v3
5861
with:
5962
name: toolchains
6063
path: ${{ matrix.target }}-x86_64-darwin.tar.gz
64+
if-no-files-found: error
6165
- name: Upload Toolchain to GitHub Release
6266
uses: svenstaro/upload-release-action@v2
6367
if: "startsWith(github.ref, 'refs/tags/')"

‎.github/workflows/aarch64.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ name: Build aarch64
1010
jobs:
1111
build:
1212
name: Build
13-
runs-on: [self-hosted, macOS, arm64]
14-
defaults:
15-
run:
16-
shell: "/usr/bin/arch -arch arm64e /bin/bash -l {0}"
13+
runs-on: [self-hosted, macOS, ARM64]
1714
strategy:
1815
fail-fast: false
1916
matrix:
@@ -30,13 +27,13 @@ jobs:
3027
- arm-unknown-linux-gnueabihf
3128
- arm-unknown-linux-musleabihf
3229
steps:
33-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
3431
- name: Install crosstool-ng
3532
run: |
36-
brew install coreutils
37-
brew install --HEAD crosstool-ng
33+
brew install coreutils crosstool-ng
3834
- name: Mount volumes
3935
run: |
36+
set -ex
4037
hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 16g -volname build build.dmg
4138
hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 1g -volname tools tools.dmg
4239
# Detach old if exists
@@ -48,6 +45,7 @@ jobs:
4845
ls /Volumes
4946
- name: Build Toolchain
5047
run: |
48+
set -ex
5149
mkdir /Volumes/build/src
5250
cd ${{ matrix.target }}
5351
ct-ng build -j $(($(nproc) - 1))
@@ -56,6 +54,7 @@ jobs:
5654
run: tail -n 500 ${{ matrix.target }}/build.log
5755
- name: Archive Toolchain
5856
run: |
57+
set -ex
5958
cd /Volumes/tools
6059
tar czf ${{ matrix.target }}-aarch64-darwin.tar.gz ${{ matrix.target }}
6160
cd -
@@ -67,10 +66,11 @@ jobs:
6766
hdiutil detach /Volumes/build -force | true
6867
hdiutil detach /Volumes/tools -force | true
6968
- name: Upload Toolchain
70-
uses: actions/upload-artifact@v2
69+
uses: actions/upload-artifact@v3
7170
with:
7271
name: toolchains
7372
path: ${{ matrix.target }}-aarch64-darwin.tar.gz
73+
if-no-files-found: error
7474
- name: Upload Toolchain to GitHub Release
7575
uses: svenstaro/upload-release-action@v2
7676
if: "startsWith(github.ref, 'refs/tags/')"

‎aarch64-unknown-linux-gnu/.config‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# crosstool-NG 1.24.0.533_681aaef Configuration
3+
# crosstool-NG 1.25.0 Configuration
44
#
55
CT_CONFIGURE_has_cxx11=y
66
CT_CONFIGURE_has_lzip=y
77
CT_CONFIGURE_has_curl=y
8+
CT_CONFIGURE_has_ninja=y
89
CT_CONFIGURE_has_rsync=y
910
CT_CONFIGURE_has_make_3_81_or_newer=y
1011
CT_CONFIGURE_has_make_4_0_or_newer=y
@@ -24,7 +25,7 @@ CT_CONFIGURE_has_sha1sum=y
2425
CT_CONFIGURE_has_sha256sum=y
2526
CT_CONFIGURE_has_sha512sum=y
2627
CT_CONFIGURE_has_install_with_strip_program=y
27-
CT_VERSION="1.24.0.533_681aaef"
28+
CT_VERSION="1.25.0"
2829
CT_VCHECK=""
2930
CT_CONFIG_VERSION_ENV="4"
3031
CT_CONFIG_VERSION_CURRENT="4"
@@ -205,7 +206,7 @@ CT_TOOLCHAIN_BUGURL=""
205206
#
206207
CT_TARGET_VENDOR="unknown"
207208
CT_TARGET_ALIAS_SED_EXPR=""
208-
CT_TARGET_ALIAS=""
209+
CT_TARGET_ALIAS="aarch64-linux-gnu"
209210

210211
#
211212
# Toolchain type
@@ -249,6 +250,7 @@ CT_LINUX_PKG_NAME="linux"
249250
CT_LINUX_SRC_RELEASE=y
250251
# CT_LINUX_SRC_DEVEL is not set
251252
CT_LINUX_PATCH_ORDER="global"
253+
# CT_LINUX_V_5_16 is not set
252254
# CT_LINUX_V_5_15 is not set
253255
# CT_LINUX_V_5_14 is not set
254256
# CT_LINUX_V_5_13 is not set
@@ -410,15 +412,18 @@ CT_GLIBC_PATCH_ORDER="global"
410412
# CT_GLIBC_V_2_23 is not set
411413
# CT_GLIBC_V_2_19 is not set
412414
CT_GLIBC_V_2_17=y
413-
# CT_GLIBC_V_2_12_1 is not set
414415
CT_GLIBC_VERSION="2.17"
415416
CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
416417
CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
417418
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
418419
CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
419420
CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
421+
CT_GLIBC_2_34_or_older=y
422+
CT_GLIBC_older_than_2_34=y
420423
CT_GLIBC_2_32_or_older=y
421424
CT_GLIBC_older_than_2_32=y
425+
CT_GLIBC_2_31_or_older=y
426+
CT_GLIBC_older_than_2_31=y
422427
CT_GLIBC_2_30_or_older=y
423428
CT_GLIBC_older_than_2_30=y
424429
CT_GLIBC_2_29_or_older=y
@@ -555,10 +560,10 @@ CT_CC_GCC_LTO_ZSTD=m
555560
#
556561
CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
557562
# CT_CC_GCC_LIBMUDFLAP is not set
558-
# CT_CC_GCC_LIBGOMP is not set
559-
# CT_CC_GCC_LIBSSP is not set
560-
# CT_CC_GCC_LIBQUADMATH is not set
561-
# CT_CC_GCC_LIBSANITIZER is not set
563+
CT_CC_GCC_LIBGOMP=y
564+
CT_CC_GCC_LIBSSP=y
565+
CT_CC_GCC_LIBQUADMATH=y
566+
CT_CC_GCC_LIBSANITIZER=y
562567

563568
#
564569
# Misc. obscure options.
@@ -706,16 +711,17 @@ CT_ISL_PKG_NAME="isl"
706711
CT_ISL_SRC_RELEASE=y
707712
# CT_ISL_SRC_DEVEL is not set
708713
CT_ISL_PATCH_ORDER="global"
709-
# CT_ISL_V_0_24 is not set
710-
CT_ISL_V_0_22=y
714+
CT_ISL_V_0_24=y
715+
# CT_ISL_V_0_23 is not set
716+
# CT_ISL_V_0_22 is not set
711717
# CT_ISL_V_0_21 is not set
712718
# CT_ISL_V_0_20 is not set
713719
# CT_ISL_V_0_19 is not set
714720
# CT_ISL_V_0_18 is not set
715721
# CT_ISL_V_0_17 is not set
716722
# CT_ISL_V_0_16 is not set
717723
# CT_ISL_V_0_15 is not set
718-
CT_ISL_VERSION="0.22"
724+
CT_ISL_VERSION="0.24"
719725
CT_ISL_MIRRORS="https://libisl.sourceforge.io"
720726
CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
721727
CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -751,7 +757,7 @@ CT_MPC_PATCH_ORDER="global"
751757
CT_MPC_V_1_2=y
752758
# CT_MPC_V_1_1 is not set
753759
# CT_MPC_V_1_0 is not set
754-
CT_MPC_VERSION="1.2.0"
760+
CT_MPC_VERSION="1.2.1"
755761
CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
756762
CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
757763
CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -807,8 +813,8 @@ CT_ZLIB_PKG_NAME="zlib"
807813
CT_ZLIB_SRC_RELEASE=y
808814
# CT_ZLIB_SRC_DEVEL is not set
809815
CT_ZLIB_PATCH_ORDER="global"
810-
CT_ZLIB_V_1_2_11=y
811-
CT_ZLIB_VERSION="1.2.11"
816+
CT_ZLIB_V_1_2_13=y
817+
CT_ZLIB_VERSION="1.2.13"
812818
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
813819
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
814820
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

‎aarch64-unknown-linux-musl/.config‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# crosstool-NG 1.24.0.533_681aaef Configuration
3+
# crosstool-NG 1.25.0 Configuration
44
#
55
CT_CONFIGURE_has_cxx11=y
66
CT_CONFIGURE_has_lzip=y
77
CT_CONFIGURE_has_curl=y
8+
CT_CONFIGURE_has_ninja=y
89
CT_CONFIGURE_has_rsync=y
910
CT_CONFIGURE_has_make_3_81_or_newer=y
1011
CT_CONFIGURE_has_make_4_0_or_newer=y
@@ -24,7 +25,7 @@ CT_CONFIGURE_has_sha1sum=y
2425
CT_CONFIGURE_has_sha256sum=y
2526
CT_CONFIGURE_has_sha512sum=y
2627
CT_CONFIGURE_has_install_with_strip_program=y
27-
CT_VERSION="1.24.0.533_681aaef"
28+
CT_VERSION="1.25.0"
2829
CT_VCHECK=""
2930
CT_CONFIG_VERSION_ENV="4"
3031
CT_CONFIG_VERSION_CURRENT="4"
@@ -214,7 +215,7 @@ CT_TOOLCHAIN_BUGURL=""
214215
#
215216
CT_TARGET_VENDOR="unknown"
216217
CT_TARGET_ALIAS_SED_EXPR=""
217-
CT_TARGET_ALIAS=""
218+
CT_TARGET_ALIAS="aarch64-linux-musl"
218219

219220
#
220221
# Toolchain type
@@ -267,6 +268,7 @@ CT_LINUX_PATCH_GLOBAL=y
267268
# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
268269
# CT_LINUX_PATCH_NONE is not set
269270
CT_LINUX_PATCH_ORDER="global"
271+
# CT_LINUX_V_5_16 is not set
270272
# CT_LINUX_V_5_15 is not set
271273
# CT_LINUX_V_5_14 is not set
272274
# CT_LINUX_V_5_13 is not set
@@ -559,9 +561,9 @@ CT_CC_GCC_LTO_ZSTD=m
559561
#
560562
CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
561563
# CT_CC_GCC_LIBMUDFLAP is not set
562-
# CT_CC_GCC_LIBGOMP is not set
563-
# CT_CC_GCC_LIBSSP is not set
564-
# CT_CC_GCC_LIBQUADMATH is not set
564+
CT_CC_GCC_LIBGOMP=y
565+
CT_CC_GCC_LIBSSP=y
566+
CT_CC_GCC_LIBQUADMATH=y
565567

566568
#
567569
# Misc. obscure options.
@@ -754,16 +756,17 @@ CT_ISL_PATCH_GLOBAL=y
754756
# CT_ISL_PATCH_LOCAL_BUNDLED is not set
755757
# CT_ISL_PATCH_NONE is not set
756758
CT_ISL_PATCH_ORDER="global"
757-
# CT_ISL_V_0_24 is not set
758-
CT_ISL_V_0_22=y
759+
CT_ISL_V_0_24=y
760+
# CT_ISL_V_0_23 is not set
761+
# CT_ISL_V_0_22 is not set
759762
# CT_ISL_V_0_21 is not set
760763
# CT_ISL_V_0_20 is not set
761764
# CT_ISL_V_0_19 is not set
762765
# CT_ISL_V_0_18 is not set
763766
# CT_ISL_V_0_17 is not set
764767
# CT_ISL_V_0_16 is not set
765768
# CT_ISL_V_0_15 is not set
766-
CT_ISL_VERSION="0.22"
769+
CT_ISL_VERSION="0.24"
767770
CT_ISL_MIRRORS="https://libisl.sourceforge.io"
768771
CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
769772
CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -813,7 +816,7 @@ CT_MPC_PATCH_ORDER="global"
813816
CT_MPC_V_1_2=y
814817
# CT_MPC_V_1_1 is not set
815818
# CT_MPC_V_1_0 is not set
816-
CT_MPC_VERSION="1.2.0"
819+
CT_MPC_VERSION="1.2.1"
817820
CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
818821
CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
819822
CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -890,8 +893,8 @@ CT_ZLIB_PATCH_GLOBAL=y
890893
# CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
891894
# CT_ZLIB_PATCH_NONE is not set
892895
CT_ZLIB_PATCH_ORDER="global"
893-
CT_ZLIB_V_1_2_11=y
894-
CT_ZLIB_VERSION="1.2.11"
896+
CT_ZLIB_V_1_2_13=y
897+
CT_ZLIB_VERSION="1.2.13"
895898
CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
896899
CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
897900
CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

0 commit comments

Comments
 (0)