summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-11-13 20:48:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-11 17:46:12 +0000
commitc2feb63de8b85b92d2d07291f6fe1008cd558a73 (patch)
tree013c7b5e9f5ecf8e8906476b552eb8f117b6eb55 /meta/classes
parenta7ce6533ed617ed8928483a1375872b7ddaffcab (diff)
downloadpoky-c2feb63de8b85b92d2d07291f6fe1008cd558a73.tar.gz
meta: drop _PYTHON_SYSCONFIGDATA_NAME hacks
(From OE-Core rev: 94a8eff9a95313e29683ebaecb83378a3c776b48) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7901859e38de06c56b8535a8425e76cb114c57dc) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/scons.bbclass3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass
index 6b171ca8df..4f3ae502ef 100644
--- a/meta/classes/scons.bbclass
+++ b/meta/classes/scons.bbclass
@@ -5,7 +5,6 @@ DEPENDS += "python3-scons-native"
5EXTRA_OESCONS ?= "" 5EXTRA_OESCONS ?= ""
6 6
7do_configure() { 7do_configure() {
8 unset _PYTHON_SYSCONFIGDATA_NAME
9 if [ -n "${CONFIGURESTAMPFILE}" ]; then 8 if [ -n "${CONFIGURESTAMPFILE}" ]; then
10 if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then 9 if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then
11 ${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} 10 ${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS}
@@ -17,13 +16,11 @@ do_configure() {
17} 16}
18 17
19scons_do_compile() { 18scons_do_compile() {
20 unset _PYTHON_SYSCONFIGDATA_NAME
21 ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ 19 ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \
22 die "scons build execution failed." 20 die "scons build execution failed."
23} 21}
24 22
25scons_do_install() { 23scons_do_install() {
26 unset _PYTHON_SYSCONFIGDATA_NAME
27 ${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ 24 ${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \
28 die "scons install execution failed." 25 die "scons install execution failed."
29} 26}