summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/cmake.bbclass3
-rw-r--r--meta/classes/python3native.bbclass2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index d91cf20130..94ed8061bb 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -175,6 +175,9 @@ cmake_do_configure() {
175 -DCMAKE_INSTALL_LIBDIR:PATH=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} \ 175 -DCMAKE_INSTALL_LIBDIR:PATH=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} \
176 -DCMAKE_INSTALL_INCLUDEDIR:PATH=${@os.path.relpath(d.getVar('includedir'), d.getVar('prefix') + '/')} \ 176 -DCMAKE_INSTALL_INCLUDEDIR:PATH=${@os.path.relpath(d.getVar('includedir'), d.getVar('prefix') + '/')} \
177 -DCMAKE_INSTALL_DATAROOTDIR:PATH=${@os.path.relpath(d.getVar('datadir'), d.getVar('prefix') + '/')} \ 177 -DCMAKE_INSTALL_DATAROOTDIR:PATH=${@os.path.relpath(d.getVar('datadir'), d.getVar('prefix') + '/')} \
178 -DPYTHON_EXECUTABLE:PATH=${PYTHON} \
179 -DPython_EXECUTABLE:PATH=${PYTHON} \
180 -DPython3_EXECUTABLE:PATH=${PYTHON} \
178 -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ 181 -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
179 -DCMAKE_INSTALL_SO_NO_EXE=0 \ 182 -DCMAKE_INSTALL_SO_NO_EXE=0 \
180 -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ 183 -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
diff --git a/meta/classes/python3native.bbclass b/meta/classes/python3native.bbclass
index 182c11aa2e..d98fb4c758 100644
--- a/meta/classes/python3native.bbclass
+++ b/meta/classes/python3native.bbclass
@@ -1,8 +1,6 @@
1inherit python3-dir 1inherit python3-dir
2 2
3PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3" 3PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
4# PYTHON_EXECUTABLE is used by cmake
5PYTHON_EXECUTABLE="${PYTHON}"
6EXTRANATIVEPATH += "python3-native" 4EXTRANATIVEPATH += "python3-native"
7DEPENDS_append = " python3-native " 5DEPENDS_append = " python3-native "
8 6