diff --git a/0002-3.10-bpo-46513-Remove-AC_C_CHAR_UNSIGNED-__CHAR_UNSI.patch b/0002-3.10-bpo-46513-Remove-AC_C_CHAR_UNSIGNED-__CHAR_UNSI.patch new file mode 100644 index 0000000000000000000000000000000000000000..e8d88b31cde401c6889f9bd9e7934c034657adcc --- /dev/null +++ b/0002-3.10-bpo-46513-Remove-AC_C_CHAR_UNSIGNED-__CHAR_UNSI.patch @@ -0,0 +1,117 @@ +From 4371fbd4328781496f5f2c6938c4d9a84049b187 Mon Sep 17 00:00:00 2001 +From: Christian Heimes +Date: Wed, 26 Jan 2022 13:20:31 +0200 +Subject: [PATCH] [3.10] bpo-46513: Remove AC_C_CHAR_UNSIGNED / + __CHAR_UNSIGNED__ (GH-30851) (GH-30914) + +Co-authored-by: Christian Heimes +--- + .../2022-01-25-12-32-37.bpo-46513.mPm9B4.rst | 2 ++ + Modules/audioop.c | 7 ---- + configure | 33 ------------------- + configure.ac | 1 - + pyconfig.h.in | 5 --- + 5 files changed, 2 insertions(+), 46 deletions(-) + create mode 100644 Misc/NEWS.d/next/Build/2022-01-25-12-32-37.bpo-46513.mPm9B4.rst + +diff --git a/Misc/NEWS.d/next/Build/2022-01-25-12-32-37.bpo-46513.mPm9B4.rst b/Misc/NEWS.d/next/Build/2022-01-25-12-32-37.bpo-46513.mPm9B4.rst +new file mode 100644 +index 0000000000..b8986ae31a +--- /dev/null ++++ b/Misc/NEWS.d/next/Build/2022-01-25-12-32-37.bpo-46513.mPm9B4.rst +@@ -0,0 +1,2 @@ ++:program:`configure` no longer uses ``AC_C_CHAR_UNSIGNED`` macro and ++``pyconfig.h`` no longer defines reserved symbol ``__CHAR_UNSIGNED__``. +diff --git a/Modules/audioop.c b/Modules/audioop.c +index 3aeb6f04f1..2a5d805c05 100644 +--- a/Modules/audioop.c ++++ b/Modules/audioop.c +@@ -5,13 +5,6 @@ + + #include "Python.h" + +-#if defined(__CHAR_UNSIGNED__) +-#if defined(signed) +-/* This module currently does not work on systems where only unsigned +- characters are available. Take it out of Setup. Sorry. */ +-#endif +-#endif +- + static const int maxvals[] = {0, 0x7F, 0x7FFF, 0x7FFFFF, 0x7FFFFFFF}; + /* -1 trick is needed on Windows to support -0x80000000 without a warning */ + static const int minvals[] = {0, -0x80, -0x8000, -0x800000, -0x7FFFFFFF-1}; +diff --git a/configure b/configure +index a7d2975f1f..e68e00b0b3 100755 +--- a/configure ++++ b/configure +@@ -14183,39 +14183,6 @@ fi + + # checks for compiler characteristics + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 +-$as_echo_n "checking whether char is unsigned... " >&6; } +-if ${ac_cv_c_char_unsigned+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((char) -1) < 0)]; +-test_array [0] = 0; +-return test_array [0]; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_c_char_unsigned=no +-else +- ac_cv_c_char_unsigned=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5 +-$as_echo "$ac_cv_c_char_unsigned" >&6; } +-if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then +- $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h +- +-fi +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 + $as_echo_n "checking for an ANSI C-conforming const... " >&6; } + if ${ac_cv_c_const+:} false; then : +diff --git a/configure.ac b/configure.ac +index 5aa91cbad3..0efeb8f585 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4322,7 +4322,6 @@ fi + + # checks for compiler characteristics + +-AC_C_CHAR_UNSIGNED + AC_C_CONST + + works=no +diff --git a/pyconfig.h.in b/pyconfig.h.in +index b97b8f8bf8..8a4aeda646 100644 +--- a/pyconfig.h.in ++++ b/pyconfig.h.in +@@ -1656,11 +1656,6 @@ + /* Define on FreeBSD to activate all library features */ + #undef __BSD_VISIBLE + +-/* Define to 1 if type `char' is unsigned and you are not using gcc. */ +-#ifndef __CHAR_UNSIGNED__ +-# undef __CHAR_UNSIGNED__ +-#endif +- + /* Define to 'long' if doesn't define. */ + #undef clock_t + +-- +2.19.1.6.gb485710b + diff --git a/python3.spec b/python3.spec index 309957149b530cd27eef5809f35aa1a32c2e287b..d474e5d709a09b3fac429564e35dbb27d0a23936 100644 --- a/python3.spec +++ b/python3.spec @@ -1,7 +1,7 @@ # ================== # Top-level metadata # ================== -%define anolis_release 1 +%define anolis_release 2 %global pybasever 3.10 # pybasever without the dot: @@ -232,6 +232,7 @@ BuildRequires: python3-rpm-generators Source0: %{url}ftp/python/%{general_version}/Python-%{upstream_version}.tar.xz Patch0001: 0001-Make-test-suite-support-Expat-2.4.5.patch +Patch0002: 0002-3.10-bpo-46513-Remove-AC_C_CHAR_UNSIGNED-__CHAR_UNSI.patch # ========================================== # Descriptions, and metadata for subpackages @@ -1479,5 +1480,8 @@ CheckPython optimized # ====================================================== %changelog +* Tue May 17 2022 Chunmei Xu - 3.10.2-2 +- Remove AC_C_CHAR_UNSIGNED and __CHAR_UNSIGNED__ + * Tue Mar 15 2022 - 3.10.2-1 - Init version from upstream v3.10.2