From 40545c5f783872ce40cb1f2370ab3d6946f15096 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 26 May 2021 20:06:05 +0200 Subject: [PATCH] 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 --- linux-arm64/crosstool-ng.config | 4 ++-- linux-armv5/crosstool-ng.config | 4 ++-- linux-armv7/crosstool-ng.config | 4 ++-- linux-armv7a/crosstool-ng.config | 2 +- linux-mips/crosstool-ng.config | 2 +- linux-ppc64le/crosstool-ng.config | 2 +- linux-s390x/crosstool-ng.config | 2 +- manylinux2010-x64/Dockerfile.in | 3 ++- manylinux2014-aarch64/crosstool-ng.config | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/linux-arm64/crosstool-ng.config b/linux-arm64/crosstool-ng.config index 5401dfe..065fce3 100644 --- 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 diff --git a/linux-armv5/crosstool-ng.config b/linux-armv5/crosstool-ng.config index 64c3171..5651394 100644 --- 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 diff --git a/linux-armv7/crosstool-ng.config b/linux-armv7/crosstool-ng.config index 4a5f106..77f5cbb 100644 --- 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 diff --git a/linux-armv7a/crosstool-ng.config b/linux-armv7a/crosstool-ng.config index 96fde63..e8d5b27 100644 --- 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 diff --git a/linux-mips/crosstool-ng.config b/linux-mips/crosstool-ng.config index 1fc2098..479aead 100644 --- 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 diff --git a/linux-ppc64le/crosstool-ng.config b/linux-ppc64le/crosstool-ng.config index 863b5cc..5b65eab 100644 --- 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 diff --git a/linux-s390x/crosstool-ng.config b/linux-s390x/crosstool-ng.config index 5f63144..aaf9035 100644 --- 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 diff --git a/manylinux2010-x64/Dockerfile.in b/manylinux2010-x64/Dockerfile.in index c34c6e4..3a8c4c4 100644 --- a/manylinux2010-x64/Dockerfile.in +++ b/manylinux2010-x64/Dockerfile.in @@ -17,6 +17,7 @@ RUN \ epel-release \ gpg \ zlib-devel \ + python3-devel \ gettext \ openssh-clients \ pax \ @@ -67,7 +68,7 @@ RUN \ /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") && \ + PYTHON=$([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python3") && \ /buildscripts/install-python-packages.sh -python ${PYTHON} && \ /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \ rm -rf /buildscripts diff --git a/manylinux2014-aarch64/crosstool-ng.config b/manylinux2014-aarch64/crosstool-ng.config index 537ad9a..1a5adb2 100644 --- 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