Merge pull request #498 from bensuperpc/master

Improve install-crosstool-ng-toolchain.sh script
Improve install-crosstool-ng-toolchain.sh scripts
2025-06-17 16:39:25 +02:00 · 2021-06-23 22:57:42 -04:00 · 2021-06-23 14:53:33 +02:00 · 2021-06-04 07:41:15 -04:00 · 2021-06-04 07:40:17 -04:00 · 2021-06-04 08:20:49 +02:00
25 changed files with 148 additions and 133 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -41,7 +41,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-s390x, linux-x64, linux-x86, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
+        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-s390x, linux-x64, linux-x86, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
    steps:
      - uses: actions/checkout@v2
      - uses: actions/download-artifact@v2
--- a/25
+++ b/25
@ -96,7 +96,7 @@ web-wasm: web-wasm/Dockerfile

 web-wasm.test: web-wasm
 	cp -r test web-wasm/
-	$(DOCKER) run $(RM) dockcross/web-wasm > $(BIN)/dockcross-web-wasm && chmod +x $(BIN)/dockcross-web-wasm
+	$(DOCKER) run $(RM) $(ORG)/web-wasm > $(BIN)/dockcross-web-wasm && chmod +x $(BIN)/dockcross-web-wasm
 	$(BIN)/dockcross-web-wasm python test/run.py --exe-suffix ".js"
 	rm -rf web-wasm/test

@ -121,7 +121,7 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile
 	rm -rf $@/imagefiles

 manylinux2014-aarch64.test: manylinux2014-aarch64
-	$(DOCKER) run $(RM) dockcross/manylinux2014-aarch64 > $(BIN)/dockcross-manylinux2014-aarch64 && chmod +x $(BIN)/dockcross-manylinux2014-aarch64
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64 > $(BIN)/dockcross-manylinux2014-aarch64 && chmod +x $(BIN)/dockcross-manylinux2014-aarch64
 	$(BIN)/dockcross-manylinux2014-aarch64 /opt/python/cp38-cp38/bin/python test/run.py

 #
@ -145,7 +145,7 @@ manylinux2014-x64: manylinux2014-x64/Dockerfile
 	rm -rf $@/imagefiles

 manylinux2014-x64.test: manylinux2014-x64
-	$(DOCKER) run $(RM) dockcross/manylinux2014-x64 > $(BIN)/dockcross-manylinux2014-x64 && chmod +x $(BIN)/dockcross-manylinux2014-x64
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x64 > $(BIN)/dockcross-manylinux2014-x64 && chmod +x $(BIN)/dockcross-manylinux2014-x64
 	$(BIN)/dockcross-manylinux2014-x64 /opt/python/cp38-cp38/bin/python test/run.py

 #
@ -169,7 +169,7 @@ manylinux2014-x86: manylinux2014-x86/Dockerfile
 	rm -rf $@/imagefiles

 manylinux2014-x86.test: manylinux2014-x86
-	$(DOCKER) run $(RM) dockcross/manylinux2014-x86 > $(BIN)/dockcross-manylinux2014-x86 && chmod +x $(BIN)/dockcross-manylinux2014-x86
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x86 > $(BIN)/dockcross-manylinux2014-x86 && chmod +x $(BIN)/dockcross-manylinux2014-x86
 	$(BIN)/dockcross-manylinux2014-x86 /opt/python/cp38-cp38/bin/python test/run.py

 #
@ -219,7 +219,7 @@ manylinux2010-x86: manylinux2010-x86/Dockerfile
 	rm -rf $@/imagefiles

 manylinux2010-x86.test: manylinux2010-x86
-	$(DOCKER) run $(RM) dockcross/manylinux2010-x86 > $(BIN)/dockcross-manylinux2010-x86 && chmod +x $(BIN)/dockcross-manylinux2010-x86
+	$(DOCKER) run $(RM) $(ORG)/manylinux2010-x86 > $(BIN)/dockcross-manylinux2010-x86 && chmod +x $(BIN)/dockcross-manylinux2010-x86
 	$(BIN)/dockcross-manylinux2010-x86 /opt/python/cp38-cp38/bin/python test/run.py

 #
@ -244,7 +244,7 @@ manylinux1-x64: manylinux1-x64/Dockerfile
 	rm -rf $@/imagefiles

 manylinux1-x64.test: manylinux1-x64
-	$(DOCKER) run $(RM) dockcross/manylinux1-x64 > $(BIN)/dockcross-manylinux1-x64 && chmod +x $(BIN)/dockcross-manylinux1-x64
+	$(DOCKER) run $(RM) $(ORG)/manylinux1-x64 > $(BIN)/dockcross-manylinux1-x64 && chmod +x $(BIN)/dockcross-manylinux1-x64
 	$(BIN)/dockcross-manylinux1-x64 /opt/python/cp38-cp38/bin/python test/run.py

 #
@ -269,7 +269,7 @@ manylinux1-x86: manylinux1-x86/Dockerfile
 	rm -rf $@/imagefiles

 manylinux1-x86.test: manylinux1-x86
-	$(DOCKER) run $(RM) dockcross/manylinux1-x86 > $(BIN)/dockcross-manylinux1-x86 && chmod +x $(BIN)/dockcross-manylinux1-x86
+	$(DOCKER) run $(RM) $(ORG)/manylinux1-x86 > $(BIN)/dockcross-manylinux1-x86 && chmod +x $(BIN)/dockcross-manylinux1-x86
 	$(BIN)/dockcross-manylinux1-x86 /opt/python/cp38-cp38/bin/python test/run.py

 #
@ -288,7 +288,7 @@ base: Dockerfile imagefiles/
 		.

 base.test: base
-	$(DOCKER) run $(RM) dockcross/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
+	$(DOCKER) run $(RM) $(ORG)/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base

 #
 # display
@ -319,12 +319,17 @@ $(STANDARD_IMAGES): %: %/Dockerfile base
 		$@
 	rm -rf $@/imagefiles

+clean:
+	for d in $(STANDARD_IMAGES) ; do rm -rf $$d/imagefiles ; done
+	for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -f $$d/Dockerfile ; done
+	rm -f Dockerfile
+
 #
 # testing implicit rule
 #
 .SECONDEXPANSION:
 $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@)
-	$(DOCKER) run $(RM) dockcross/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@)
+	$(DOCKER) run $(RM) $(ORG)/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@)
 	$(BIN)/dockcross-$(basename $@) python test/run.py $($@_ARGS)

 #
@ -335,4 +340,4 @@ test.prerequisites:

 $(addsuffix .test,base $(IMAGES)): test.prerequisites

-.PHONY: base images $(IMAGES) test %.test
+.PHONY: base images $(IMAGES) test %.test clean
--- a/common.crosstool
+++ b/common.crosstool
@ -42,6 +42,7 @@ RUN mkdir /dockcross/crosstool \
 && /dockcross/install-crosstool-ng-toolchain.sh \
  -p "${XCC_PREFIX}" \
  -c /dockcross/crosstool-ng.config \
+  -v "${CT_VERSION}" \
 && rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh

 # Restore our default workdir (from "dockcross/base").
--- a/common.debian
+++ b/common.debian
@ -30,8 +30,8 @@ RUN \
    ncurses-dev \
    pkg-config \
    pax \
-    python \
-    python-pip \
+#    python3 \
+#    python3-pip \
    rsync \
    sed \
    ssh \
@ -41,5 +41,23 @@ RUN \
    xz-utils \
    zip \
    zlib1g-dev \
+# python build
+    libncurses5-dev \
+    libgdbm-dev \
+    libnss3-dev \
+    libssl-dev \
+    libsqlite3-dev \
+    libreadline-dev \
+    libffi-dev \
+    libbz2-dev\
  && \
  apt-get clean --yes
+
+# build and install python
+COPY \
+  imagefiles/build-and-install-python.sh \
+  /buildscripts/
+RUN \
+  set -x && \
+  /buildscripts/build-and-install-python.sh && \
+  rm -rf /buildscripts
--- a/common.manylinux
+++ b/common.manylinux
@ -8,6 +8,7 @@ RUN \
  yum -y install \
    $([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "" || echo "epel-release") \
    gpg \
+    python3-devel \
    zlib-devel \
    gettext \
    openssh-clients \
--- a/imagefiles/build-and-install-python.sh
+++ b/imagefiles/build-and-install-python.sh
@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+#
+# Configure, build and install python
+#
+# Usage:
+#
+#  build-and-install-python.sh [-version 3.9.5]
+
+PYTHON_VERSION=3.9.5
+while [ $# -gt 0 ]; do
+  case "$1" in
+    -version|-v)
+      PYTHON_VERSION=$2
+      shift
+      ;;&
+    *)
+      echo "Usage: Usage: ${0##*/} [-version 3.9.5]"
+      exit 1
+      ;;
+  esac
+  shift
+done
+
+# Download
+wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
+tar xvf Python-${PYTHON_VERSION}.tgz
+# Configure, build and install
+cd Python-${PYTHON_VERSION}
+# Disable --enable-shared --enable-optimizations --prefix=/usr/local/python-${PYTHON_VERSION}
+./configure --with-ensurepip=install
+make -j$(nproc) 
+make install #altinstall
+
+ln -s /usr/local/bin/python3 /usr/local/bin/python
+ln -s /usr/local/bin/pip3 /usr/local/bin/pip
+
+# Clean
+cd ..
+rm -rf Python-${PYTHON_VERSION}
--- a/imagefiles/install-crosstool-ng-toolchain.sh
+++ b/imagefiles/install-crosstool-ng-toolchain.sh
@ -16,7 +16,7 @@ set -o pipefail
 # be generated underneath of here.
 ROOT=${PWD}

-usage() { echo "Usage: $0 -p <prefix> -c <config-path>" 1>&2; exit 1; }
+usage() { echo "Usage: $0 -p <prefix> -c <config-path> -v <version>" 1>&2; exit 1; }

 # Resolve our input parameters.
 #
@ -24,7 +24,8 @@ usage() { echo "Usage: $0 -p <prefix> -c <config-path>" 1>&2; exit 1; }
 # change directories during installation.
 CT_PREFIX=
 CONFIG_PATH=
-while getopts "p:c:" o; do
+REV=
+while getopts "p:c:v:" o; do
  case "${o}" in
  p)
    CT_PREFIX=$(readlink -f ${OPTARG})
@ -32,6 +33,9 @@ while getopts "p:c:" o; do
  c)
    CONFIG_PATH=$(readlink -f ${OPTARG})
    ;;
+  v)
+    REV=${OPTARG}
+    ;;
  *)
    usage
    ;;
@ -48,6 +52,12 @@ if [ -z ${CONFIG_PATH} ] || [ ! -f ${CONFIG_PATH} ]; then
  usage
 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
+fi
+
+
 ##
 # Build "crosstool-ng".
 ##
@ -57,12 +67,17 @@ mkdir -p "${CTNG}"
 cd "${CTNG}"

 # Download and install the "crosstool-ng" source.
-REV=1.23.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
-cd "crosstool-ng-crosstool-ng-${REV}"
+
+git clone https://github.com/crosstool-ng/crosstool-ng.git
+cd crosstool-ng
+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
+fi

 # Bootstrap and install the tool.
 BOOTSTRAP_PREFIX="${CTNG}/prefix"
@ -96,5 +111,6 @@ cp "${CONFIG_PATH}" "${BUILD}/.config"
 unset LD_LIBRARY_PATH

 # Build and install the toolchain!
-"${BOOTSTRAP_PREFIX}/bin/ct-ng" build
+# Print last 250 lines if build fail
+"${BOOTSTRAP_PREFIX}/bin/ct-ng" build || tail -250 build.log

--- a/imagefiles/install-python-packages.sh
+++ b/imagefiles/install-python-packages.sh
@ -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

--- a/linux-arm64/Dockerfile.in
+++ b/linux-arm64/Dockerfile.in
@ -2,6 +2,9 @@ FROM dockcross/base:latest

 # This is for 64-bit ARM Linux machine

+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"

 # The cross-compiling emulator
--- a/linux-arm64/crosstool-ng.config
+++ b/linux-arm64/crosstool-ng.config
@ -431,7 +431,7 @@ CT_DEBUG_gdb=y
 CT_GDB_CROSS=y
 # CT_GDB_CROSS_STATIC is not set
 # CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
+CT_GDB_CROSS_PYTHON=n
 CT_GDB_CROSS_PYTHON_BINARY=""
 CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
 # CT_GDB_NATIVE is not set
@ -449,7 +449,7 @@ CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y
 CT_GDB_7_0_or_later=y
 CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
+CT_GDB_HAS_PYTHON=n
 CT_GDB_INSTALL_GDBINIT=y
 # CT_DEBUG_ltrace is not set
 # CT_DEBUG_strace is not set
--- a/linux-armv5/Dockerfile.in
+++ b/linux-armv5/Dockerfile.in
@ -4,6 +4,9 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
 # VFP instructions (armhf).

+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"

 # The cross-compiling emulator
--- a/linux-armv5/crosstool-ng.config
+++ b/linux-armv5/crosstool-ng.config
@ -428,7 +428,7 @@ CT_DEBUG_gdb=y
 CT_GDB_CROSS=y
 # CT_GDB_CROSS_STATIC is not set
 # CT_GDB_CROSS_SIM is not set
-CT_GDB_CROSS_PYTHON=y
+CT_GDB_CROSS_PYTHON=n
 CT_GDB_CROSS_PYTHON_BINARY=""
 CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
 # CT_GDB_NATIVE is not set
@ -446,7 +446,7 @@ CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y
 CT_GDB_7_0_or_later=y
 CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
+CT_GDB_HAS_PYTHON=n
 CT_GDB_INSTALL_GDBINIT=y
 # CT_DEBUG_ltrace is not set
 # CT_DEBUG_strace is not set
--- a/linux-armv7/Dockerfile.in
+++ b/linux-armv7/Dockerfile.in
@ -1,6 +1,9 @@
 FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"

--- a/linux-armv7/crosstool-ng.config
+++ b/linux-armv7/crosstool-ng.config
@ -428,7 +428,7 @@ CT_DEBUG_gdb=y
 CT_GDB_CROSS=y
 # CT_GDB_CROSS_STATIC is not set
 CT_GDB_CROSS_SIM=y
-CT_GDB_CROSS_PYTHON=y
+CT_GDB_CROSS_PYTHON=n
 CT_GDB_CROSS_PYTHON_BINARY=""
 CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
 # CT_GDB_NATIVE is not set
@ -446,7 +446,7 @@ CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y
 CT_GDB_7_0_or_later=y
 CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
+CT_GDB_HAS_PYTHON=n
 CT_GDB_INSTALL_GDBINIT=y
 # CT_DEBUG_ltrace is not set
 # CT_DEBUG_strace is not set
--- a/linux-armv7a/Dockerfile.in
+++ b/linux-armv7a/Dockerfile.in
@ -2,6 +2,10 @@ FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # This is for 32-bit ARMv7 Linux
+
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"

 # The cross-compiling emulator
--- a/linux-armv7a/crosstool-ng.config
+++ b/linux-armv7a/crosstool-ng.config
@ -514,7 +514,7 @@ CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y
 CT_GDB_7_0_or_later=y
 CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
+CT_GDB_HAS_PYTHON=n
 CT_GDB_INSTALL_GDBINIT=y
 # CT_DEBUG_ltrace is not set
 # CT_DEBUG_strace is not set
--- a/linux-mips/Dockerfile.in
+++ b/linux-mips/Dockerfile.in
@ -2,6 +2,9 @@ FROM dockcross/base:latest

 # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled

+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"

 # The cross-compiling emulator
--- a/linux-mips/crosstool-ng.config
+++ b/linux-mips/crosstool-ng.config
@ -442,7 +442,7 @@ CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y
 CT_GDB_7_0_or_later=y
 CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
+CT_GDB_HAS_PYTHON=n
 CT_GDB_INSTALL_GDBINIT=y
 # CT_DEBUG_ltrace is not set
 # CT_DEBUG_strace is not set
--- a/linux-ppc64le/Dockerfile.in
+++ b/linux-ppc64le/Dockerfile.in
@ -1,31 +1,22 @@
 FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

-COPY sources.list /etc/apt/sources.list
-RUN dpkg --add-architecture ppc64el ; apt-get update ; apt-get -y upgrade ; apt-get update ;
-
-ENV CROSS_TRIPLE powerpc64le-linux-gnu
-
-RUN apt-get install -y \
-  libbz2-dev:ppc64el \
-  libexpat1-dev:ppc64el \
-  ncurses-dev:ppc64el \
-  libssl-dev:ppc64el \
-  python-dev
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0

 #include "common.crosstool"

-# ENV CROSS_TRIPLE powerpc64le-unknown-linux-gnu
+ENV CROSS_TRIPLE powerpc64le-linux-gnu

 WORKDIR /usr/src

 RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
-  curl -L http://wiki.qemu-project.org/download/qemu-2.6.0.tar.bz2 | tar xj && \
-  cd qemu-2.6.0 && \
+  curl -L http://wiki.qemu-project.org/download/qemu-3.1.0.tar.bz2 | tar xj && \
+  cd qemu-3.1.0 && \
  ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
  make -j$(nproc) && \
  make install && \
-  cd .. && rm -rf qemu-2.6.0
+  cd .. && rm -rf qemu-3.1.0

 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
@ -52,4 +43,3 @@ ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH powerpc

 #include "common.label-and-env"
-
--- a/linux-ppc64le/crosstool-ng.config
+++ b/linux-ppc64le/crosstool-ng.config
@ -441,7 +441,7 @@ CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y
 CT_GDB_7_0_or_later=y
 CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
+CT_GDB_HAS_PYTHON=n
 CT_GDB_INSTALL_GDBINIT=y
 # CT_DEBUG_ltrace is not set
 # CT_DEBUG_strace is not set
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@ -2,6 +2,9 @@ FROM dockcross/base:latest

 # This is for 64-bit S390X Linux machine

+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"

 # The cross-compiling emulator
--- a/linux-s390x/crosstool-ng.config
+++ b/linux-s390x/crosstool-ng.config
@ -443,7 +443,7 @@ CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y
 CT_GDB_7_0_or_later=y
 CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
+CT_GDB_HAS_PYTHON=n
 CT_GDB_INSTALL_GDBINIT=y
 # CT_DEBUG_ltrace is not set
 # CT_DEBUG_strace is not set
--- a/manylinux2010-x64/Dockerfile.in
+++ b/manylinux2010-x64/Dockerfile.in
@ -4,87 +4,15 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x64

 #include "common.manylinux"
-# Image build scripts
-COPY \
-  imagefiles/install-gosu-binary.sh \
-  imagefiles/install-gosu-binary-wrapper.sh \
-  manylinux-common/install-python-packages.sh \
-  /buildscripts/
-
-RUN \
-  set -x && \
-  yum -y install \
-    epel-release \
-    gpg \
-    zlib-devel \
-    gettext \
-    openssh-clients \
-    pax \
-    wget \
-    zip \
-  && \
-  yum clean all && \
-  /buildscripts/install-gosu-binary.sh && \
-  /buildscripts/install-gosu-binary-wrapper.sh && \
-  # Remove sudo provided by "devtoolset-2" and "devtoolset-8" since it doesn't work with
-  # our sudo wrapper calling gosu.
-  rm -f /opt/rh/devtoolset-2/root/usr/bin/sudo && \
-  rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \
-  rm -f /opt/rh/devtoolset-8/root/usr/bin/sudo && \
-  /buildscripts/install-python-packages.sh && \
-  rm -rf /buildscripts
-
-# Runtime scripts
-COPY manylinux-common/pre_exec.sh /dockcross/

 #include "common.dockcross"

 #include "common.docker"
-WORKDIR /usr/src
-
-ARG GIT_VERSION=2.22.0
-ARG CMAKE_VERSION=3.17.1
-
-# Image build scripts
-COPY \
-  imagefiles/build-and-install-cmake.sh \
-  imagefiles/build-and-install-curl.sh \
-  imagefiles/build-and-install-git.sh \
-  imagefiles/build-and-install-ninja.sh \
-  imagefiles/build-and-install-openssl.sh \
-  imagefiles/build-and-install-openssh.sh \
-  imagefiles/install-cmake-binary.sh \
-  imagefiles/install-liquidprompt-binary.sh \
-  imagefiles/install-python-packages.sh \
-  imagefiles/utils.sh \
-  /buildscripts/
-
-RUN \
-  X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux1-x86" -o "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2010-x86" ] && echo "-32" || echo "") && \
-  /buildscripts/build-and-install-openssl.sh $X86_FLAG && \
-  /buildscripts/build-and-install-openssh.sh && \
-  /buildscripts/build-and-install-curl.sh && \
-  /buildscripts/build-and-install-git.sh && \
-  /buildscripts/install-cmake-binary.sh $X86_FLAG && \
-  /buildscripts/install-liquidprompt-binary.sh && \
-  PYTHON=$([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \
-  /buildscripts/install-python-packages.sh -python ${PYTHON} && \
-  /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \
-  rm -rf /buildscripts
-
-RUN echo "root:root" | chpasswd
-WORKDIR /work
-ENTRYPOINT ["/dockcross/entrypoint.sh"]
-
-# Runtime scripts
-COPY imagefiles/cmake.sh /usr/local/bin/cmake
-COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
-COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/

 # Override yum to work around the problem with newly built libcurl.so.4
 # https://access.redhat.com/solutions/641093
 RUN echo $'#!/bin/bash\n\
-LD_PRELOAD=/usr/lib64/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum
+LD_PRELOAD=/usr/lib/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum

 ENV CROSS_TRIPLE x86_64-linux-gnu
 ENV CROSS_ROOT /opt/rh/devtoolset-8/root/usr/bin
--- a/manylinux2014-aarch64/crosstool-ng.config
+++ b/manylinux2014-aarch64/crosstool-ng.config
@ -449,7 +449,7 @@ CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y
 CT_GDB_7_0_or_later=y
 CT_GDB_HAS_PKGVERSION_BUGURL=y
-CT_GDB_HAS_PYTHON=y
+CT_GDB_HAS_PYTHON=n
 CT_GDB_INSTALL_GDBINIT=y
 # CT_DEBUG_ltrace is not set
 # CT_DEBUG_strace is not set
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.4
+FROM emscripten/emsdk:2.0.22
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Revert back to "/bin/sh" as default shell
@ -6,13 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 RUN rm /bin/sh && ln -s /bin/dash /bin/sh

 ARG DEBIAN_FRONTEND=noninteractive
-ARG REPO=http://cdn-fastly.deb.debian.org

 RUN \
-  bash -c "echo \"deb $REPO/debian buster main contrib non-free\" > /etc/apt/sources.list"  && \
-  bash -c "echo \"deb $REPO/debian buster-updates main contrib non-free\" >> /etc/apt/sources.list"  && \
-  bash -c "echo \"deb $REPO/debian-security buster/updates main\" >> /etc/apt/sources.list" && \
-  bash -c "echo \"deb http://ftp.debian.org/debian buster-backports main\" >> /etc/apt/sources.list" && \
  apt-get update --yes && \
  apt-get install --no-install-recommends --yes \
    automake \
@ -35,8 +30,8 @@ RUN \
    ncurses-dev \
    pkg-config \
    libtool \
-    python \
-    python-pip \
+    python3 \
+    python3-pip \
    rsync \
    sed \
    ssh \
@ -51,11 +46,13 @@ RUN \
  && \
  apt-get clean --yes

+RUN ln -s /usr/bin/python3 /usr/bin/python
+
 #include "common.dockcross"

 #include "common.docker"

-ENV EMSCRIPTEN_VERSION 2.0.4
+ENV EMSCRIPTEN_VERSION 2.0.22

 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \
Author	SHA1	Message	Date
Matt McCormick	35eb05cefe	Merge pull request #498 from bensuperpc/master Improve install-crosstool-ng-toolchain.sh script	2021-06-23 22:57:42 -04:00
Bensuperpc	2082f62c76	Improve install-crosstool-ng-toolchain.sh scripts It is now possible to choose the version of crosstool-ng per image, To make it easier to upgrade crosstool-ng to newer versions without having to update all images at the same time Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-06-23 14:53:33 +02:00
Matt McCormick	9adf96c16b	Merge pull request #494 from Bensuperpc/update_qemu	2021-06-04 07:41:15 -04:00
Matt McCormick	5c27a89330	Merge pull request #495 from Bensuperpc/update_web-wasm	2021-06-04 07:40:17 -04:00
Bensuperpc	b266cd1e26	Merge commit 'a9599e9e2a4786e77079ed92e2f07bf17bac702f' into update_qemu	2021-06-04 08:20:49 +02:00
Bensuperpc	629046cd37	Merge branch 'master' into update_web-wasm	2021-06-04 08:17:07 +02:00
Bensuperpc	e70d9ce7f9	Merge branch 'master' into update_makefile	2021-06-04 08:13:15 +02:00
Matt McCormick	9d2866b1fe	Merge pull request #496 from Bensuperpc/update_python Update python to python 3.x and fix build fail with manylinux images	2021-06-03 17:46:13 -04:00
Bensuperpc	a9599e9e2a	Update CI Update CI Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-27 00:04:49 +02:00
Bensuperpc	2dc4fb4b0d	Update web-wasm to 2.0.22 Update web-wasm to 2.0.22 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-27 00:01:06 +02:00
Bensuperpc	773adc1e8a	Update web-wasm to 2.0.22 Update web-wasm to 2.0.22 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-26 23:58:41 +02:00
Bensuperpc	2f5df2b697	Update web-wasm to 2.0.15 Update web-wasm to 2.0.15 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-26 23:03:58 +02:00
Bensuperpc	fd80ca0a17	Fix build fail Fix build fail Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-26 22:28:33 +02:00
Bensuperpc	b3bf66de2f	Fix build fail with manylinux2010-x64 Fix build fail with manylinux2010-x64 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-26 21:05:35 +02:00
Bensuperpc	40545c5f78	Disable python with GDB Disable python with GDB: GDB 8.1 and lower have issues with python 3.7 and upper : https://bugzilla.redhat.com/show_bug.cgi?id=1577396 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-26 20:06:05 +02:00
Bensuperpc	8ff660facd	Update to python 3.9.5, fix build fail with manylinuximage Update to python 3.9.5, fix build fail with manylinuximage Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-26 20:02:47 +02:00
Bensuperpc	0f47b27eea	Update linux-ppc64le/Dockerfile.in Deleting an unnecessary comment Co-authored-by: Jonas Vautherin <jonas.vautherin@protonmail.ch>	2021-05-24 09:08:25 +02:00
Bensuperpc	47e0c321a4	Add linux-ppc64le to CI Add linux-ppc64le to CI Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-23 00:25:25 +02:00
Bensuperpc	0888deb9fa	Update Qemu to 3.1 on linux-ppc64le and remove packages who break with debian buster Update Qemu to 3.1 on on linux-ppc64le and remove packages who break with debian buster: https://askubuntu.com/questions/564282/apt-get-unmet-dependencies-but-it-is-not-going-to-be-installed Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-22 22:29:03 +02:00
Bensuperpc	7f019a564b	Revert "Return to older verion of manylinux" This reverts commit `e0d2efb0e8`.	2021-05-20 22:38:57 +02:00
Bensuperpc	0eb098c0cb	Revert "Disable pip from bootstrap.pypa.io" This reverts commit `f34b72ed29`.	2021-05-20 22:38:48 +02:00
Bensuperpc	598b045300	Remove dev branch in CI Remove dev branch in CI Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-20 19:13:07 +02:00
Bensuperpc	f34b72ed29	Disable pip from bootstrap.pypa.io Disable pip from bootstrap.pypa.io: It will be reactivated later Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-20 17:31:02 +02:00
Bensuperpc	e0d2efb0e8	Return to older verion of manylinux Return to older verion of manylinux: From manylinux2010_x86_64:latest to manylinux2010_x86_64:2021-04-09-c61dabe From manylinux2010_i686:latest to manylinux2010_i686:2021-04-09-c61dabe From manylinux2014_x86_64:latest to manylinux2014_x86_64:2021-04-09-c61dabe From manylinux2014_i686:latest to manylinux2014_i686:2021-04-09-c61dabe Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-20 14:08:25 +02:00
Bensuperpc	9891530c90	Update makefile and improve CI Update makefile and improve CI: Add clean rule in makefile Change dockcross/ to / Add dev branch in CI Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-05-19 23:12:15 +02:00