Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-12 14:09:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update crosstool-ng to 1.24, update arm64 and newer base image

Browse Source
This commit is contained in:
Bensuperpc
2021-05-07 00:59:07 +02:00
parent b31b269fec
commit 2cc0a157d7
10 changed files with 555 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imagefiles/build-and-install-ninja.sh
View File

@ -10,7 +10,7 @@
set -e
set -o pipefail
PYTHON=python
PYTHON=python3
while [ $# -gt 0 ]; do
case "$1" in
-python)

11
imagefiles/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() {

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

@ -57,11 +57,11 @@ mkdir -p "${CTNG}"
cd "${CTNG}"
# Download and install the "crosstool-ng" source.
REV=1.23.0
REV=1.24.0
curl -# -LO \
"https://github.com/crosstool-ng/crosstool-ng/archive/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
#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}"
# Bootstrap and install the tool.
@ -71,7 +71,6 @@ BOOTSTRAP_PREFIX="${CTNG}/prefix"
--prefix "${BOOTSTRAP_PREFIX}"
make -j$(nproc)
make install
##
# Use "crosstool-ng" to build the toolchain.
##

6
imagefiles/install-python-packages.sh
View File

@ -3,7 +3,7 @@
set -e
set -o pipefail
PYTHON=python
PYTHON=python3
while [ $# -gt 0 ]; do
case "$1" in
-python)
@ -22,8 +22,8 @@ cd /tmp
# Todo: Need to update base image from Debian Stretch for the required Python
# 3.6 or later
# curl -# -LO https://bootstrap.pypa.io/pip/get-pip.py
curl -# -LO https://bootstrap.pypa.io/pip/2.7/get-pip.py
curl -# -LO https://bootstrap.pypa.io/pip/get-pip.py
#curl -# -LO https://bootstrap.pypa.io/pip/2.7/get-pip.py
${PYTHON} get-pip.py --ignore-installed
rm get-pip.py