diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-11-13 20:48:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-16 14:27:46 +0000 |
commit | acfdab8daa3a67ebabc65fb7e152cc3a476b4333 (patch) | |
tree | acef72e7dfb817733655c18a2ec25b770f46d157 /meta/classes | |
parent | 3ec7f79ad2687381300010392c3320cca0dc638e (diff) | |
download | poky-acfdab8daa3a67ebabc65fb7e152cc3a476b4333.tar.gz |
meta: drop _PYTHON_SYSCONFIGDATA_NAME hacks
(From OE-Core rev: d3a81dd0e72a3495bfc7cc969c2bb806b666023d)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/scons.bbclass | 3 |
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" | |||
5 | EXTRA_OESCONS ?= "" | 5 | EXTRA_OESCONS ?= "" |
6 | 6 | ||
7 | do_configure() { | 7 | do_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 | ||
19 | scons_do_compile() { | 18 | scons_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 | ||
25 | scons_do_install() { | 23 | scons_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 | } |