Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-10 21:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix manylinux2014-aarch64 image building

Browse Source 
* switch image to crosstool-ng 1.25.0
* remove support of ct-ng 1.13.0 and set 1.25.0 as the default version
This commit is contained in:
Mickaël Guérin
2023-01-27 13:19:09 +01:00
committed by Mickaël Guérin
parent 670f7f7c5c
commit f152c4b25e
10 changed files with 614 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
imagefiles/install-crosstool-ng-toolchain.sh
View File

@ -53,8 +53,8 @@ if [ -z ${CONFIG_PATH} ] || [ ! -f ${CONFIG_PATH} ]; then
fi
if [ -z ${REV} ]; then
echo "WARNING: No version selected, use default version: crosstool-ng-1.23.0 (-v)."
REV=crosstool-ng-1.23.0
echo "WARNING: No version selected, use default version: crosstool-ng-1.25.0 (-v)."
REV=crosstool-ng-1.25.0
fi
@ -75,15 +75,6 @@ git fetch --tags
# checkout
git checkout ${REV}
if [ ${REV} = "crosstool-ng-1.23.0" ]; then
patch scripts/build/companion_libs/210-expat.sh -i /dockcross/crosstool-ng-expat.patch
# Patch to fix error with bash 5 and up: https://github.com/pfalcon/esp-open-sdk/issues/365
patch configure.ac -i /dockcross/Fix-error-with-bash-5-and-up.patch
# Clean patch
rm /dockcross/Fix-error-with-bash-5-and-up.patch
rm /dockcross/crosstool-ng-expat.patch
fi
# Bootstrap and install the tool.
BOOTSTRAP_PREFIX="${CTNG}/prefix"
./bootstrap

28
imagefiles/patch/crosstool-ng/Fix-error-with-bash-5-and-up.patch
View File

@ -1,28 +0,0 @@
From 67368ebe9d9259e9f34a4f9166a33357858813f1 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Thu, 24 Jun 2021 11:55:48 +0200
Subject: [PATCH 1/1] Fix error with bash 5 and up
Fix error with bash 5 and up
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index d10bf71d..e2302b4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,7 +274,7 @@ ACX_PROG_VERSION_REQ_STRICT([BASH_SHELL],
[GNU bash >= 3.1],
[bash],
[bash],
- ['^GNU bash, version (3\.[1-9]|4)'])
+ ['^GNU bash, version (3\.[1-9]|4|5)'])
# We need a awk that *is* GNU awk
ACX_PROG_VERSION_REQ_STRICT([AWK],
--
2.32.0

11
imagefiles/patch/crosstool-ng/crosstool-ng-expat.patch
View File

@ -1,11 +0,0 @@
--- crosstool-ng-crosstool-ng-1.23.0/scripts/build/companion_libs/210-expat.sh 2021-04-05 13:55:31.047130000 +0000
+++ crosstool-ng-crosstool-ng-1.23.0/scripts/build/companion_libs/210-expat.sh.new 2021-04-05 13:57:13.841170000 +0000
@@ -10,7 +10,7 @@
do_expat_get() {
CT_GetFile "expat-${CT_EXPAT_VERSION}" .tar.gz \
- http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}
+ https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION//./_}
}
do_expat_extract() {