diff options
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 | 37 |
1 files changed, 19 insertions, 18 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 a0ea897f4e..fb10ca94b3 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 2645317fef09afe31b01bb2c1d4fe5b9afdbb11a Mon Sep 17 00:00:00 2001 | 1 | From 994783da5c21cab81b6589ed2d4275e665a946f9 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 |
@@ -21,12 +21,13 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> | |||
21 | patch originally from Li Zhou, I just rework it to new version | 21 | 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 | --- |
25 | configure.ac | 19 ++++++++++--------- | 26 | configure.ac | 19 ++++++++++--------- |
26 | 1 file changed, 10 insertions(+), 9 deletions(-) | 27 | 1 file changed, 10 insertions(+), 9 deletions(-) |
27 | 28 | ||
28 | diff --git a/configure.ac b/configure.ac | 29 | diff --git a/configure.ac b/configure.ac |
29 | index a7de901..4a3681f 100644 | 30 | index a189d42..0f85486 100644 |
30 | --- a/configure.ac | 31 | --- a/configure.ac |
31 | +++ b/configure.ac | 32 | +++ b/configure.ac |
32 | @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h) | 33 | @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h) |
@@ -37,7 +38,7 @@ index a7de901..4a3681f 100644 | |||
37 | 38 | ||
38 | # pybuilddir.txt will be created by --generate-posix-vars in the Makefile | 39 | # pybuilddir.txt will be created by --generate-posix-vars in the Makefile |
39 | rm -f pybuilddir.txt | 40 | rm -f pybuilddir.txt |
40 | @@ -695,7 +696,7 @@ AC_MSG_RESULT($with_cxx_main) | 41 | @@ -671,7 +672,7 @@ AC_MSG_RESULT($with_cxx_main) |
41 | preset_cxx="$CXX" | 42 | preset_cxx="$CXX" |
42 | if test -z "$CXX" | 43 | if test -z "$CXX" |
43 | then | 44 | then |
@@ -46,7 +47,7 @@ index a7de901..4a3681f 100644 | |||
46 | gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; | 47 | gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; |
47 | cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; | 48 | cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; |
48 | clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; | 49 | clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; |
49 | @@ -979,7 +980,7 @@ rmdir CaseSensitiveTestDir | 50 | @@ -957,7 +958,7 @@ rmdir CaseSensitiveTestDir |
50 | 51 | ||
51 | case $ac_sys_system in | 52 | case $ac_sys_system in |
52 | hp*|HP*) | 53 | hp*|HP*) |
@@ -55,7 +56,7 @@ index a7de901..4a3681f 100644 | |||
55 | cc|*/cc) CC="$CC -Ae";; | 56 | cc|*/cc) CC="$CC -Ae";; |
56 | esac;; | 57 | esac;; |
57 | esac | 58 | esac |
58 | @@ -1336,7 +1337,7 @@ else | 59 | @@ -1335,7 +1336,7 @@ else |
59 | fi], | 60 | fi], |
60 | [AC_MSG_RESULT(no)]) | 61 | [AC_MSG_RESULT(no)]) |
61 | if test "$Py_LTO" = 'true' ; then | 62 | if test "$Py_LTO" = 'true' ; then |
@@ -64,7 +65,7 @@ index a7de901..4a3681f 100644 | |||
64 | *clang*) | 65 | *clang*) |
65 | AC_SUBST(LLVM_AR) | 66 | AC_SUBST(LLVM_AR) |
66 | AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) | 67 | AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) |
67 | @@ -1426,7 +1427,7 @@ then | 68 | @@ -1425,7 +1426,7 @@ then |
68 | fi | 69 | fi |
69 | fi | 70 | fi |
70 | LLVM_PROF_ERR=no | 71 | LLVM_PROF_ERR=no |
@@ -73,16 +74,16 @@ index a7de901..4a3681f 100644 | |||
73 | *clang*) | 74 | *clang*) |
74 | # Any changes made here should be reflected in the GCC+Darwin case below | 75 | # Any changes made here should be reflected in the GCC+Darwin case below |
75 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" | 76 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" |
76 | @@ -1500,7 +1501,7 @@ then | 77 | @@ -1486,7 +1487,7 @@ esac |
77 | WRAP="-fwrapv" | 78 | # compiler and platform. BASECFLAGS tweaks need to be made even if the |
78 | fi | 79 | # user set OPT. |
79 | 80 | ||
80 | - case $CC in | 81 | -case $CC in |
81 | + case $cc_basename in | 82 | +case $cc_basename in |
82 | *clang*) | 83 | *clang*) |
83 | cc_is_clang=1 | 84 | cc_is_clang=1 |
84 | ;; | 85 | ;; |
85 | @@ -1623,7 +1624,7 @@ yes) | 86 | @@ -1622,7 +1623,7 @@ yes) |
86 | 87 | ||
87 | # ICC doesn't recognize the option, but only emits a warning | 88 | # ICC doesn't recognize the option, but only emits a warning |
88 | ## XXX does it emit an unused result warning and can it be disabled? | 89 | ## XXX does it emit an unused result warning and can it be disabled? |
@@ -91,7 +92,7 @@ index a7de901..4a3681f 100644 | |||
91 | *icc*) | 92 | *icc*) |
92 | ac_cv_disable_unused_result_warning=no | 93 | ac_cv_disable_unused_result_warning=no |
93 | ;; | 94 | ;; |
94 | @@ -1965,7 +1966,7 @@ yes) | 95 | @@ -1943,7 +1944,7 @@ yes) |
95 | esac | 96 | esac |
96 | 97 | ||
97 | # ICC needs -fp-model strict or floats behave badly | 98 | # ICC needs -fp-model strict or floats behave badly |
@@ -100,7 +101,7 @@ index a7de901..4a3681f 100644 | |||
100 | *icc*) | 101 | *icc*) |
101 | CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" | 102 | CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" |
102 | ;; | 103 | ;; |
103 | @@ -2727,7 +2728,7 @@ then | 104 | @@ -2711,7 +2712,7 @@ then |
104 | then | 105 | then |
105 | LINKFORSHARED="-Wl,--export-dynamic" | 106 | LINKFORSHARED="-Wl,--export-dynamic" |
106 | fi;; | 107 | fi;; |
@@ -109,7 +110,7 @@ index a7de901..4a3681f 100644 | |||
109 | *gcc*) | 110 | *gcc*) |
110 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null | 111 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
111 | then | 112 | then |
112 | @@ -5429,7 +5430,7 @@ if test "$have_gcc_asm_for_x87" = yes; then | 113 | @@ -5362,7 +5363,7 @@ if test "$have_gcc_asm_for_x87" = yes; then |
113 | # Some versions of gcc miscompile inline asm: | 114 | # Some versions of gcc miscompile inline asm: |
114 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 | 115 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 |
115 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html | 116 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html |