diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-06 17:26:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-08 10:57:19 +0000 |
commit | e2c3247c233876ab090c9ce3d5325a6d46ab350f (patch) | |
tree | cf38957a3510be612cde924f6184a5251b968a43 /meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch | |
parent | cd6c61a26177296e24b442e2eda1514b5f931c0a (diff) | |
download | poky-e2c3247c233876ab090c9ce3d5325a6d46ab350f.tar.gz |
python3: upgrade to 3.7.2
I took the same approach as the recent perl upgrade: write recipe from scratch,
taking the pieces from the old recipe only when they were proven to be necessary.
The pgo, manifest and ptest features are all preserved.
New features:
- native and target recipes are now unified into one recipe
- check_build_completeness.py runs right after do_compile() and verifies that
all optional modules have been built (a notorious source of regressions)
- a new approach to sysconfig.py and distutils/sysconfig.py returning values
appropriate for native or target builds: we copy the configuration file to a
separate folder, add that folder to sys.path (through environment variable
that differs between native and target builds), and point python to the file
through another environment variable.
There were a few other patches where it was difficult to decide if the patch
is still relevant, and how to test that it works correctly; please add those
as-needed by testing the new python.
(From OE-Core rev: 02714c105426b0d687620913c1a7401b386428b6)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch | 50 |
1 files changed, 15 insertions, 35 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch index ae473661ec..5735954628 100644 --- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +++ b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 564a5cc634028970dc2f9d8ecc0e464a4fb1dcb6 Mon Sep 17 00:00:00 2001 | 1 | From 2645317fef09afe31b01bb2c1d4fe5b9afdbb11a Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 | 3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 |
4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler | 4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler |
@@ -22,11 +22,11 @@ patch originally from Li Zhou, I just rework it to new version | |||
22 | 22 | ||
23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
24 | --- | 24 | --- |
25 | configure.ac | 23 ++++++++++++----------- | 25 | configure.ac | 19 ++++++++++--------- |
26 | 1 file changed, 12 insertions(+), 11 deletions(-) | 26 | 1 file changed, 10 insertions(+), 9 deletions(-) |
27 | 27 | ||
28 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
29 | index 95c98d1..1b9589e 100644 | 29 | index a7de901..4a3681f 100644 |
30 | --- a/configure.ac | 30 | --- a/configure.ac |
31 | +++ b/configure.ac | 31 | +++ b/configure.ac |
32 | @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h) | 32 | @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h) |
@@ -37,7 +37,7 @@ index 95c98d1..1b9589e 100644 | |||
37 | 37 | ||
38 | # pybuilddir.txt will be created by --generate-posix-vars in the Makefile | 38 | # pybuilddir.txt will be created by --generate-posix-vars in the Makefile |
39 | rm -f pybuilddir.txt | 39 | rm -f pybuilddir.txt |
40 | @@ -716,7 +717,7 @@ AC_MSG_RESULT($with_cxx_main) | 40 | @@ -695,7 +696,7 @@ AC_MSG_RESULT($with_cxx_main) |
41 | preset_cxx="$CXX" | 41 | preset_cxx="$CXX" |
42 | if test -z "$CXX" | 42 | if test -z "$CXX" |
43 | then | 43 | then |
@@ -46,15 +46,7 @@ index 95c98d1..1b9589e 100644 | |||
46 | gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; | 46 | gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; |
47 | cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; | 47 | cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; |
48 | clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; | 48 | clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; |
49 | @@ -978,14 +979,14 @@ rmdir CaseSensitiveTestDir | 49 | @@ -979,7 +980,7 @@ rmdir CaseSensitiveTestDir |
50 | |||
51 | case $MACHDEP in | ||
52 | bsdos*) | ||
53 | - case $CC in | ||
54 | + case $cc_basename in | ||
55 | gcc) CC="$CC -D_HAVE_BSDI";; | ||
56 | esac;; | ||
57 | esac | ||
58 | 50 | ||
59 | case $ac_sys_system in | 51 | case $ac_sys_system in |
60 | hp*|HP*) | 52 | hp*|HP*) |
@@ -63,16 +55,16 @@ index 95c98d1..1b9589e 100644 | |||
63 | cc|*/cc) CC="$CC -Ae";; | 55 | cc|*/cc) CC="$CC -Ae";; |
64 | esac;; | 56 | esac;; |
65 | esac | 57 | esac |
66 | @@ -1310,7 +1311,7 @@ else | 58 | @@ -1336,7 +1337,7 @@ else |
67 | fi], | 59 | fi], |
68 | [AC_MSG_RESULT(no)]) | 60 | [AC_MSG_RESULT(no)]) |
69 | if test "$Py_LTO" = 'true' ; then | 61 | if test "$Py_LTO" = 'true' ; then |
70 | - case $CC in | 62 | - case $CC in |
71 | + case $cc_basename in | 63 | + case $cc_basename in |
72 | *clang*) | 64 | *clang*) |
73 | # Any changes made here should be reflected in the GCC+Darwin case below | 65 | AC_SUBST(LLVM_AR) |
74 | LTOFLAGS="-flto" | 66 | AC_PATH_TARGET_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) |
75 | @@ -1374,7 +1375,7 @@ then | 67 | @@ -1426,7 +1427,7 @@ then |
76 | fi | 68 | fi |
77 | fi | 69 | fi |
78 | LLVM_PROF_ERR=no | 70 | LLVM_PROF_ERR=no |
@@ -81,7 +73,7 @@ index 95c98d1..1b9589e 100644 | |||
81 | *clang*) | 73 | *clang*) |
82 | # Any changes made here should be reflected in the GCC+Darwin case below | 74 | # Any changes made here should be reflected in the GCC+Darwin case below |
83 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" | 75 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" |
84 | @@ -1451,7 +1452,7 @@ then | 76 | @@ -1500,7 +1501,7 @@ then |
85 | WRAP="-fwrapv" | 77 | WRAP="-fwrapv" |
86 | fi | 78 | fi |
87 | 79 | ||
@@ -90,7 +82,7 @@ index 95c98d1..1b9589e 100644 | |||
90 | *clang*) | 82 | *clang*) |
91 | cc_is_clang=1 | 83 | cc_is_clang=1 |
92 | ;; | 84 | ;; |
93 | @@ -1553,7 +1554,7 @@ yes) | 85 | @@ -1623,7 +1624,7 @@ yes) |
94 | 86 | ||
95 | # ICC doesn't recognize the option, but only emits a warning | 87 | # ICC doesn't recognize the option, but only emits a warning |
96 | ## XXX does it emit an unused result warning and can it be disabled? | 88 | ## XXX does it emit an unused result warning and can it be disabled? |
@@ -99,7 +91,7 @@ index 95c98d1..1b9589e 100644 | |||
99 | *icc*) | 91 | *icc*) |
100 | ac_cv_disable_unused_result_warning=no | 92 | ac_cv_disable_unused_result_warning=no |
101 | ;; | 93 | ;; |
102 | @@ -1808,7 +1809,7 @@ yes) | 94 | @@ -1965,7 +1966,7 @@ yes) |
103 | esac | 95 | esac |
104 | 96 | ||
105 | # ICC needs -fp-model strict or floats behave badly | 97 | # ICC needs -fp-model strict or floats behave badly |
@@ -108,16 +100,7 @@ index 95c98d1..1b9589e 100644 | |||
108 | *icc*) | 100 | *icc*) |
109 | CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" | 101 | CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" |
110 | ;; | 102 | ;; |
111 | @@ -2574,7 +2575,7 @@ then | 103 | @@ -2727,7 +2728,7 @@ then |
112 | then CCSHARED="-fPIC" | ||
113 | else CCSHARED="-Kpic -belf" | ||
114 | fi;; | ||
115 | - IRIX*/6*) case $CC in | ||
116 | + IRIX*/6*) case $cc_basename in | ||
117 | *gcc*) CCSHARED="-shared";; | ||
118 | *) CCSHARED="";; | ||
119 | esac;; | ||
120 | @@ -2615,7 +2616,7 @@ then | ||
121 | then | 104 | then |
122 | LINKFORSHARED="-Wl,--export-dynamic" | 105 | LINKFORSHARED="-Wl,--export-dynamic" |
123 | fi;; | 106 | fi;; |
@@ -126,7 +109,7 @@ index 95c98d1..1b9589e 100644 | |||
126 | *gcc*) | 109 | *gcc*) |
127 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null | 110 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
128 | then | 111 | then |
129 | @@ -5187,7 +5188,7 @@ if test "$have_gcc_asm_for_x87" = yes; then | 112 | @@ -5429,7 +5430,7 @@ if test "$have_gcc_asm_for_x87" = yes; then |
130 | # Some versions of gcc miscompile inline asm: | 113 | # Some versions of gcc miscompile inline asm: |
131 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 | 114 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 |
132 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html | 115 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html |
@@ -135,6 +118,3 @@ index 95c98d1..1b9589e 100644 | |||
135 | *gcc*) | 118 | *gcc*) |
136 | AC_MSG_CHECKING(for gcc ipa-pure-const bug) | 119 | AC_MSG_CHECKING(for gcc ipa-pure-const bug) |
137 | saved_cflags="$CFLAGS" | 120 | saved_cflags="$CFLAGS" |
138 | -- | ||
139 | 2.7.4 | ||
140 | |||