Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 09:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #483 from mayeut/fix-get-expat

Browse Source 
fix: crosstool-ng expat dowload
This commit is contained in:
Jonas Vautherin 2021-04-07 10:42:02 +02:00 committed by GitHub
commit 58c9889c7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common-manylinux.crosstool
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/

1
common.crosstool
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/

11
imagefiles/crosstool-ng-expat.patch Normal file
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() {

1
imagefiles/install-crosstool-ng-toolchain.sh
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.