From ef6ea08a78b5f07acaea0e9634de62628cb628a7 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Fri, 14 May 2021 08:19:31 +0200
Subject: [PATCH] Fix

---
 .github/workflows/main.yml     |   3 +-
 common.manylinux               |   1 +
 linux-armv6/Dockerfile.in      |   6 +-
 linux-armv6/Toolchain.cmake    |   2 +-
 linux-armv7a/Dockerfile.in     |   2 -
 linux-m68k/Dockerfile.in       |   2 +-
 linux-m68k/crosstool-ng.config | 136 ++++++++++++++++++---------------
 linux-riscv64/Dockerfile.in    |   2 +-
 linux-s390x/Dockerfile.in      |   6 +-
 linux-s390x/Toolchain.cmake    |   2 +-
 10 files changed, 89 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 877ec50..5cd953f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,8 +44,9 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
+# manylinux2014-aarch64
       matrix:
-        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8, linux-armv8-musl, linux-armv8-rpi3, linux-armv8-rpi4, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv6-rpi, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x86, linux-riscv64, 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-armv8, linux-armv8-musl, linux-armv8-rpi3, linux-armv8-rpi4, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv6-rpi, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x86, linux-riscv64, manylinux2014-x64, manylinux2014-x86, 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
diff --git a/common.manylinux b/common.manylinux
index a9434ea..909d03f 100644
--- a/common.manylinux
+++ b/common.manylinux
@@ -14,6 +14,7 @@ RUN \
     pax \
     wget \
     zip \
+    lzip \ 
   && \
   yum clean all && \
   # Remove sudo provided by devtoolset since it doesn't work with
diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in
index 40704ed..82a9691 100644
--- a/linux-armv6/Dockerfile.in
+++ b/linux-armv6/Dockerfile.in
@@ -12,8 +12,8 @@ RUN apt-get update \
 && apt-get clean --yes
 
 
-# The CROSS_TRIPLE is a configured alias of the "armv6-unknown-linux-gnueabihf" target.
-ENV CROSS_TRIPLE armv6-unknown-linux-gnueabihf
+# The CROSS_TRIPLE is a configured alias of the "armv6-rpi-linux-gnueabihf" target.
+ENV CROSS_TRIPLE armv6-rpi-linux-gnueabihf
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
@@ -36,6 +36,4 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm
 
-RUN cd /usr/xcc/ && find . -name '*linux*'
-
 #include "common.label-and-env"
diff --git a/linux-armv6/Toolchain.cmake b/linux-armv6/Toolchain.cmake
index 0081916..18f624c 100644
--- a/linux-armv6/Toolchain.cmake
+++ b/linux-armv6/Toolchain.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "armv6-unknown-linux-gnueabihf")
+set(cross_triple "armv6-rpi-linux-gnueabihf")
 set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in
index 5cb8e9f..e6d1954 100644
--- a/linux-armv7a/Dockerfile.in
+++ b/linux-armv7a/Dockerfile.in
@@ -36,6 +36,4 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm
 
-#include "common.lib"
-
 #include "common.label-and-env"
diff --git a/linux-m68k/Dockerfile.in b/linux-m68k/Dockerfile.in
index e2216e5..c22d245 100644
--- a/linux-m68k/Dockerfile.in
+++ b/linux-m68k/Dockerfile.in
@@ -29,7 +29,7 @@ ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
 
-ENV PKG_CONFIG_PATH /usr/lib/m68k-uclinux-uclibc/
+ENV PKG_CONFIG_PATH /usr/lib/m68k-unknown-uclinux-uclibc/
 
 # Linux kernel cross compilation variables
 ENV PATH ${PATH}:${CROSS_ROOT}/bin
diff --git a/linux-m68k/crosstool-ng.config b/linux-m68k/crosstool-ng.config
index 3e22279..427d095 100644
--- a/linux-m68k/crosstool-ng.config
+++ b/linux-m68k/crosstool-ng.config
@@ -113,11 +113,12 @@ CT_CONFIG_SHELL="${bash}"
 # CT_LOG_ERROR is not set
 # CT_LOG_WARN is not set
 # CT_LOG_INFO is not set
-# CT_LOG_EXTRA is not set
-CT_LOG_ALL=y
+CT_LOG_EXTRA=y
+# CT_LOG_ALL is not set
 # CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="ALL"
+CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -445,8 +446,8 @@ CT_LIBC_UCLIBC_CONFIG_FILE=""
 CT_LIBC_UCLIBC_LNXTHRD=""
 # CT_LIBC_UCLIBC_LOCALES is not set
 # CT_LIBC_UCLIBC_LIBICONV is not set
-CT_LIBC_UCLIBC_IPV6=y
-CT_LIBC_UCLIBC_WCHAR=y
+# CT_LIBC_UCLIBC_IPV6 is not set
+# CT_LIBC_UCLIBC_WCHAR is not set
 # CT_LIBC_UCLIBC_FENV is not set
 CT_LIBC_UCLIBC_HAS_SSP=y
 # CT_LIBC_UCLIBC_BUILD_SSP is not set
@@ -526,7 +527,7 @@ CT_CC_GCC_ENABLE_CXX_FLAGS=""
 CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
 CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
 CT_CC_GCC_STATIC_LIBSTDCXX=y
-# CT_CC_GCC_SYSTEM_ZLIB is not set
+CT_CC_GCC_SYSTEM_ZLIB=y
 CT_CC_GCC_CONFIG_TLS=m
 
 #
@@ -567,58 +568,15 @@ CT_ALL_CC_CHOICES="GCC"
 #
 # Additional supported languages:
 #
-# CT_CC_LANG_CXX is not set
-# CT_CC_LANG_FORTRAN is not set
+CT_CC_LANG_CXX=y
+CT_CC_LANG_FORTRAN=y
 # end of C compiler
 
 #
 # Debug facilities
 #
 # CT_DEBUG_DUMA is not set
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-CT_GDB_USE_GNU=y
-CT_GDB_USE="GDB"
-CT_GDB_PKG_NAME="gdb"
-CT_GDB_SRC_RELEASE=y
-# CT_GDB_SRC_DEVEL is not set
-CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_9_2=y
-# CT_GDB_V_8_3 is not set
-# CT_GDB_V_8_2 is not set
-# CT_GDB_V_8_1 is not set
-# CT_GDB_V_8_0 is not set
-# CT_GDB_V_7_12 is not set
-# CT_GDB_V_7_11 is not set
-CT_GDB_VERSION="9.2"
-CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
-CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_later_than_8_0=y
-CT_GDB_8_0_or_later=y
-CT_GDB_later_than_7_12=y
-CT_GDB_7_12_or_later=y
-CT_GDB_later_than_7_2=y
-CT_GDB_7_2_or_later=y
-CT_GDB_later_than_7_0=y
-CT_GDB_7_0_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-# CT_GDB_CROSS_PYTHON is not set
-CT_GDB_CROSS_PYTHON_BINARY=""
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-CT_GDB_GDBSERVER=y
-# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
-CT_GDB_HAS_PKGVERSION_BUGURL=y
-# CT_GDB_HAS_PYTHON is not set
-CT_GDB_INSTALL_GDBINIT=y
-CT_GDB_HAS_IPA_LIB=y
+# CT_DEBUG_GDB is not set
 # CT_DEBUG_LTRACE is not set
 # CT_DEBUG_STRACE is not set
 CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
@@ -628,7 +586,24 @@ CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
 # Companion libraries
 #
 # CT_COMPLIBS_CHECK is not set
-# CT_COMP_LIBS_CLOOG is not set
+CT_COMP_LIBS_CLOOG=y
+CT_COMP_LIBS_CLOOG_PKG_KSYM="CLOOG"
+CT_CLOOG_DIR_NAME="cloog"
+CT_CLOOG_PKG_NAME="cloog"
+CT_CLOOG_SRC_RELEASE=y
+# CT_CLOOG_SRC_DEVEL is not set
+CT_CLOOG_PATCH_ORDER="global"
+CT_CLOOG_V_0_18_4=y
+CT_CLOOG_VERSION="0.18.4"
+CT_CLOOG_MIRRORS="http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure"
+CT_CLOOG_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_CLOOG_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_CLOOG_ARCHIVE_FORMATS=".tar.gz"
+CT_CLOOG_SIGNATURE_FORMAT=""
+CT_CLOOG_0_18_4_or_later=y
+CT_CLOOG_0_18_4_or_older=y
+CT_CLOOG_later_than_0_18_1=y
+CT_CLOOG_0_18_1_or_later=y
 CT_COMP_LIBS_EXPAT=y
 CT_COMP_LIBS_EXPAT_PKG_KSYM="EXPAT"
 CT_EXPAT_DIR_NAME="expat"
@@ -643,7 +618,21 @@ CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_EXPAT_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2 .tar.gz"
 CT_EXPAT_SIGNATURE_FORMAT=""
-# CT_COMP_LIBS_GETTEXT is not set
+CT_COMP_LIBS_GETTEXT=y
+CT_COMP_LIBS_GETTEXT_PKG_KSYM="GETTEXT"
+CT_GETTEXT_DIR_NAME="gettext"
+CT_GETTEXT_PKG_NAME="gettext"
+CT_GETTEXT_SRC_RELEASE=y
+# CT_GETTEXT_SRC_DEVEL is not set
+CT_GETTEXT_PATCH_ORDER="global"
+CT_GETTEXT_V_0_20_1=y
+# CT_GETTEXT_V_0_19_8_1 is not set
+CT_GETTEXT_VERSION="0.20.1"
+CT_GETTEXT_MIRRORS="$(CT_Mirrors GNU gettext)"
+CT_GETTEXT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_GETTEXT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_GETTEXT_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_GETTEXT_SIGNATURE_FORMAT="packed/.sig"
 CT_COMP_LIBS_GMP=y
 CT_COMP_LIBS_GMP_PKG_KSYM="GMP"
 CT_GMP_DIR_NAME="gmp"
@@ -698,8 +687,35 @@ CT_ISL_0_13_or_later=y
 CT_ISL_later_than_0_12=y
 CT_ISL_0_12_or_later=y
 CT_ISL_REQUIRE_0_12_or_later=y
-# CT_COMP_LIBS_LIBELF is not set
-# CT_COMP_LIBS_LIBICONV is not set
+CT_COMP_LIBS_LIBELF=y
+CT_COMP_LIBS_LIBELF_PKG_KSYM="LIBELF"
+CT_LIBELF_DIR_NAME="libelf"
+CT_LIBELF_PKG_NAME="libelf"
+CT_LIBELF_SRC_RELEASE=y
+# CT_LIBELF_SRC_DEVEL is not set
+CT_LIBELF_PATCH_ORDER="global"
+CT_LIBELF_V_0_8=y
+CT_LIBELF_VERSION="0.8.13"
+CT_LIBELF_MIRRORS="https://fossies.org/linux/misc/old http://oe-lite.org/mirror/libelf/ http://ftp.osuosl.org/pub/blfs/conglomeration/libelf/"
+CT_LIBELF_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_LIBELF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_LIBELF_ARCHIVE_FORMATS=".tar.gz"
+CT_LIBELF_SIGNATURE_FORMAT=""
+CT_COMP_LIBS_LIBICONV=y
+CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV"
+CT_LIBICONV_DIR_NAME="libiconv"
+CT_LIBICONV_PKG_NAME="libiconv"
+CT_LIBICONV_SRC_RELEASE=y
+# CT_LIBICONV_SRC_DEVEL is not set
+CT_LIBICONV_PATCH_ORDER="global"
+CT_LIBICONV_V_1_16=y
+# CT_LIBICONV_V_1_15 is not set
+CT_LIBICONV_VERSION="1.16"
+CT_LIBICONV_MIRRORS="$(CT_Mirrors GNU libiconv)"
+CT_LIBICONV_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_LIBICONV_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_LIBICONV_ARCHIVE_FORMATS=".tar.gz"
+CT_LIBICONV_SIGNATURE_FORMAT="packed/.sig"
 CT_COMP_LIBS_MPC=y
 CT_COMP_LIBS_MPC_PKG_KSYM="MPC"
 CT_MPC_DIR_NAME="mpc"
@@ -776,20 +792,20 @@ CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
 CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
-# CT_LIBICONV_NEEDED is not set
-# CT_GETTEXT_NEEDED is not set
+CT_LIBICONV_NEEDED=y
+CT_GETTEXT_NEEDED=y
 CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
-CT_EXPAT_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
+CT_LIBICONV=y
+CT_GETTEXT=y
 CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
-CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
 # end of Companion libraries
diff --git a/linux-riscv64/Dockerfile.in b/linux-riscv64/Dockerfile.in
index e8162d6..39b7054 100644
--- a/linux-riscv64/Dockerfile.in
+++ b/linux-riscv64/Dockerfile.in
@@ -29,7 +29,7 @@ ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
 
-ENV PKG_CONFIG_PATH /usr/lib/aarch64-linux-gnu/pkgconfig
+ENV PKG_CONFIG_PATH /usr/lib/riscv64-unknown-linux-gnu/pkgconfig
 
 # Linux kernel cross compilation variables
 ENV PATH ${PATH}:${CROSS_ROOT}/bin
diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in
index dc2ecd8..ca67867 100644
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@@ -11,8 +11,8 @@ RUN apt-get update \
   qemu-user-static \
 && apt-get clean --yes
 
-# The CROSS_TRIPLE is a configured alias of the "s390x-unknown-linux-gnu" target.
-ENV CROSS_TRIPLE s390x-unknown-linux-gnu
+# The CROSS_TRIPLE is a configured alias of the "s390x-ibm-linux-gnu" target.
+ENV CROSS_TRIPLE s390x-ibm-linux-gnu
 
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
@@ -29,6 +29,8 @@ ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
 
+ENV PKG_CONFIG_PATH /usr/lib/s390x-ibm-linux-gnu/pkgconfig
+
 # Linux kernel cross compilation variables
 ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
diff --git a/linux-s390x/Toolchain.cmake b/linux-s390x/Toolchain.cmake
index d971528..2fffdd9 100644
--- a/linux-s390x/Toolchain.cmake
+++ b/linux-s390x/Toolchain.cmake
@@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR s390x)
 
-set(cross_triple "s390x-unknown-linux-gnu")
+set(cross_triple "s390x-ibm-linux-gnu")
 set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})