mirror of
https://git.yoctoproject.org/poky
synced 2026-02-03 23:38:44 +01:00
8cd040c218
Drop upstreamed patch and refresh remaining patches. * https://www.python.org/downloads/release/python-31017/ Security content in this release * gh-131809: Upgrade vendored expat to 2.7.1 * gh-80222: Folding of quoted string in display_name violates RFC * gh-121284: Invalid RFC 2047 address header after refolding with email.policy.default * gh-131261: Update libexpat to 2.7.0 * gh-105704: CVE-2025-0938 urlparse does not flag hostname containing [ or ] as incorrect * gh-119511: OOM vulnerability in the imaplib module * https://www.python.org/downloads/release/python-31018/ Security content in this release * gh-135034: [CVE 2024-12718] [CVE 2025-4138] [CVE 2025-4330] [CVE 2025-4435] [CVE 2025-4517] Fixes multiple issues that allowed tarfile extraction filters (filter="data" and filter="tar") to be bypassed using crafted symlinks and hard links. * gh-133767: Fix use-after-free in the “unicode-escape” decoder with a non-“strict” error handler. * gh-128840: Short-circuit the processing of long IPv6 addresses early in ipaddress to prevent excessive memory consumption and a minor denial-of-service. gh-133767 got meawhile CVE-2025-4516 assigned. (From OE-Core rev: 838a8b5ca148dfa6c6c2c76f1705d1e358a31648) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
122 lines
3.5 KiB
Diff
122 lines
3.5 KiB
Diff
From 9f68a27eb34394a00f1011c06900c609f15fb15c Mon Sep 17 00:00:00 2001
|
|
From: Changqing Li <changqing.li@windriver.com>
|
|
Date: Mon, 22 Oct 2018 15:19:51 +0800
|
|
Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
|
|
|
|
When working path contains "clang"/"gcc"/"icc", it might be part of $CC
|
|
because of the "--sysroot" parameter. That could cause judgement error
|
|
about clang/gcc/icc compilers. e.g.
|
|
When "icc" is containded in working path, below errors are reported when
|
|
compiling python3:
|
|
x86_64-wrs-linux-gcc: error: strict: No such file or directory
|
|
x86_64-wrs-linux-gcc: error: unrecognized command line option '-fp-model'
|
|
|
|
Here use cc_basename to replace CC for checking compiler to avoid such
|
|
kind of issue.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
|
|
|
patch originally from Li Zhou, I just rework it to new version
|
|
|
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|
|
|
---
|
|
configure.ac | 19 ++++++++++---------
|
|
1 file changed, 10 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 0c06914..299786b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -61,6 +61,7 @@ AC_CONFIG_HEADER(pyconfig.h)
|
|
AC_CANONICAL_HOST
|
|
AC_SUBST(build)
|
|
AC_SUBST(host)
|
|
+LT_INIT
|
|
|
|
# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
|
|
rm -f pybuilddir.txt
|
|
@@ -688,7 +689,7 @@ AC_MSG_RESULT($with_cxx_main)
|
|
preset_cxx="$CXX"
|
|
if test -z "$CXX"
|
|
then
|
|
- case "$CC" in
|
|
+ case "$cc_basename" in
|
|
gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
|
|
cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
|
|
clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
|
|
@@ -981,7 +982,7 @@ rmdir CaseSensitiveTestDir
|
|
|
|
case $ac_sys_system in
|
|
hp*|HP*)
|
|
- case $CC in
|
|
+ case $cc_basename in
|
|
cc|*/cc) CC="$CC -Ae";;
|
|
esac;;
|
|
esac
|
|
@@ -1379,7 +1380,7 @@ else
|
|
fi],
|
|
[AC_MSG_RESULT(no)])
|
|
if test "$Py_LTO" = 'true' ; then
|
|
- case $CC in
|
|
+ case $cc_basename in
|
|
*clang*)
|
|
AC_SUBST(LLVM_AR)
|
|
AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
|
|
@@ -1472,7 +1473,7 @@ then
|
|
fi
|
|
fi
|
|
LLVM_PROF_ERR=no
|
|
-case $CC in
|
|
+case $cc_basename in
|
|
*clang*)
|
|
# Any changes made here should be reflected in the GCC+Darwin case below
|
|
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
|
|
@@ -1533,7 +1534,7 @@ esac
|
|
# compiler and platform. BASECFLAGS tweaks need to be made even if the
|
|
# user set OPT.
|
|
|
|
-case $CC in
|
|
+case $cc_basename in
|
|
*clang*)
|
|
cc_is_clang=1
|
|
;;
|
|
@@ -1669,7 +1670,7 @@ yes)
|
|
|
|
# ICC doesn't recognize the option, but only emits a warning
|
|
## XXX does it emit an unused result warning and can it be disabled?
|
|
- case "$CC" in
|
|
+ case "$cc_basename" in
|
|
*icc*)
|
|
ac_cv_disable_unused_result_warning=no
|
|
;;
|
|
@@ -2023,7 +2024,7 @@ yes)
|
|
;;
|
|
esac
|
|
|
|
-case "$CC" in
|
|
+case "$cc_basename" in
|
|
*icc*)
|
|
# ICC needs -fp-model strict or floats behave badly
|
|
CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
|
|
@@ -2841,7 +2842,7 @@ then
|
|
then
|
|
LINKFORSHARED="-Wl,--export-dynamic"
|
|
fi;;
|
|
- SunOS/5*) case $CC in
|
|
+ SunOS/5*) case $cc_basename in
|
|
*gcc*)
|
|
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|
|
then
|
|
@@ -5628,7 +5629,7 @@ if test "$have_gcc_asm_for_x87" = yes; then
|
|
# Some versions of gcc miscompile inline asm:
|
|
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
|
|
# http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
|
|
- case $CC in
|
|
+ case $cc_basename in
|
|
*gcc*)
|
|
AC_MSG_CHECKING(for gcc ipa-pure-const bug)
|
|
saved_cflags="$CFLAGS"
|