fix: crosstool-ng expat dowload

expat shall now be downloaded from github rather than sourceforge.
This commit patches crosstool-ng 1.23.0 to do this.
This commit is contained in:
mayeut 2021-04-05 16:21:43 +02:00
parent 4349cb4999
commit 78601a759d
No known key found for this signature in database
GPG Key ID: 8B03CED67D3ABFBA
4 changed files with 14 additions and 0 deletions

View File

@ -47,6 +47,7 @@ ENV XCC_PREFIX=/usr/xcc
# for users. # for users.
COPY \ COPY \
imagefiles/install-crosstool-ng-toolchain.sh \ imagefiles/install-crosstool-ng-toolchain.sh \
imagefiles/crosstool-ng-expat.patch \
manylinux2014-aarch64/crosstool-ng.config \ manylinux2014-aarch64/crosstool-ng.config \
/dockcross/ /dockcross/

View File

@ -32,6 +32,7 @@ ENV XCC_PREFIX=/usr/xcc
# for users. # for users.
COPY \ COPY \
imagefiles/install-crosstool-ng-toolchain.sh \ imagefiles/install-crosstool-ng-toolchain.sh \
imagefiles/crosstool-ng-expat.patch \
crosstool-ng.config \ crosstool-ng.config \
/dockcross/ /dockcross/

View File

@ -0,0 +1,11 @@
--- 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() {

View File

@ -61,6 +61,7 @@ REV=1.23.0
curl -# -LO \ curl -# -LO \
"https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-${REV}.tar.gz" "https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-${REV}.tar.gz"
tar -xf "crosstool-ng-${REV}.tar.gz" tar -xf "crosstool-ng-${REV}.tar.gz"
patch crosstool-ng-crosstool-ng-1.23.0/scripts/build/companion_libs/210-expat.sh -i /dockcross/crosstool-ng-expat.patch
cd "crosstool-ng-crosstool-ng-${REV}" cd "crosstool-ng-crosstool-ng-${REV}"
# Bootstrap and install the tool. # Bootstrap and install the tool.