mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
28c5a5033e
Drop backports, rebase other patches. 0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch is removed as the use case (allowing python 2 and 3 to coexist in SDKs) is no longer relevant with Python 2.x reaching end of line and upstream has refactored the code making a rebase difficult. If needed, please re-add the patch to py2, rather than py3. Python 3.8 no longer adds "m" to "3.8" in paths, so adjust the recipes and classes accordingly. The manifest for the 3.8.0 version is updated; particularly pkgutil module is now packaged in -core (as other things in core need it); this also necessitates allowing empty -pkgutil package to avoid breakage across layers. (From OE-Core rev: e6ab9f16b92aa1abdae82c535c1a452a1341b0e2) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
122 lines
3.5 KiB
Diff
122 lines
3.5 KiB
Diff
From 994783da5c21cab81b6589ed2d4275e665a946f9 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 a189d42..0f85486 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -54,6 +54,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
|
|
@@ -671,7 +672,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]) ;;
|
|
@@ -957,7 +958,7 @@ rmdir CaseSensitiveTestDir
|
|
|
|
case $ac_sys_system in
|
|
hp*|HP*)
|
|
- case $CC in
|
|
+ case $cc_basename in
|
|
cc|*/cc) CC="$CC -Ae";;
|
|
esac;;
|
|
esac
|
|
@@ -1335,7 +1336,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})
|
|
@@ -1425,7 +1426,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"
|
|
@@ -1486,7 +1487,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
|
|
;;
|
|
@@ -1622,7 +1623,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
|
|
;;
|
|
@@ -1943,7 +1944,7 @@ yes)
|
|
esac
|
|
|
|
# ICC needs -fp-model strict or floats behave badly
|
|
-case "$CC" in
|
|
+case "$cc_basename" in
|
|
*icc*)
|
|
CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
|
|
;;
|
|
@@ -2711,7 +2712,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
|
|
@@ -5362,7 +5363,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"
|