clang: Let cmake figure out python version for native

supply python3 for nativesdk and target recipes

Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 9 insertions, 33 deletions

diff --git a/recipes-devtools/clang/clang/0021-lldb-Do-not-look-for-interpreter.patch b/recipes-devtools/clang/clang/0021-lldb-Do-not-look-for-interpreter.patch
deleted file mode 100644
index d8f790d..0000000
--- a/recipes-devtools/clang/clang/0021-lldb-Do-not-look-for-interpreter.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 52d4ec36f9d3635750ff5d4fb006ec625833fd12 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 4 Sep 2019 22:17:18 -0700
-Subject: [PATCH] lldb: Do not look for interpreter
-
-We pass PYTHON_EXECUTABLE explicitly
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lldb/cmake/modules/LLDBConfig.cmake | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
-index 0dca557601f..0bfd498ef9a 100644
---- a/lldb/cmake/modules/LLDBConfig.cmake
-+++ b/lldb/cmake/modules/LLDBConfig.cmake
-@@ -213,7 +213,6 @@ if (NOT LLDB_DISABLE_PYTHON)
-       add_definitions( -DLLDB_PYTHON_HOME="${LLDB_PYTHON_HOME}" )
-     endif()
-   else()
--    find_package(PythonInterp REQUIRED)
-     find_package(PythonLibs REQUIRED)
-   endif()
- 
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 988b6a3..3906ef1 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -17,7 +17,7 @@ BUILD_RANLIB_class-nativesdk = "llvm-ranlib"
 BUILD_NM_class-nativesdk = "llvm-nm"
 LDFLAGS_append_class-nativesdk = " -fuse-ld=gold"
 
-inherit cmake cmake-native python3native
+inherit cmake cmake-native python3-dir
 
 OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
 
@@ -93,9 +93,6 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
                   -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR} \
                   -G Ninja ${S}/llvm \
                   -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
-                  -DPYTHON_EXECUTABLE=${PYTHON} \
-                  -DPYTHON_LIBRARY='${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so' \
-                  -DPYTHON_INCLUDE_DIR='${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}' \
 "
 
 EXTRA_OECMAKE_append_class-native = "\
@@ -117,6 +114,8 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
                   -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                   -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
                   -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \
+                  -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \
+                  -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
 "
 EXTRA_OECMAKE_append_class-target = "\
                   -DCMAKE_CROSSCOMPILING:BOOL=ON \
@@ -129,11 +128,13 @@ EXTRA_OECMAKE_append_class-target = "\
                   -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \
                   -DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \
                   -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS}${HF} \
+                  -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \
+                  -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
 "
 
 DEPENDS = "binutils zlib libffi libxml2 libedit ninja-native swig-native"
-DEPENDS_append_class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils-crosssdk"
-DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH}"
+DEPENDS_append_class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils-crosssdk nativesdk-python3"
+DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} python3"
 
 BOOTSTRAPSTAGE ?= ""
 BOOTSTRAPSTAGE_class-native = "stage2"
@@ -162,7 +163,7 @@ do_compile() {
 
 do_install() {
         DESTDIR=${D} ninja ${PARALLEL_MAKE} ${INSTALLTARGET}
-        rm -rf ${D}${libdir}/python3*/site-packages/six.py
+        rm -rf ${D}${libdir}/python*/site-packages/six.py
 }
 
 do_install_append_class-native () {
@@ -190,7 +191,7 @@ PACKAGES =+ "${PN}-libllvm ${PN}-lldb-python libclang"
 
 BBCLASSEXTEND = "native nativesdk"
 
-FILES_${PN}-lldb-python = "${libdir}/python3*/site-packages/lldb/*"
+FILES_${PN}-lldb-python = "${libdir}/python*/site-packages/lldb/*"
 
 FILES_${PN} += "\
   ${libdir}/BugpointPasses.so \
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 0e5816c..ceb9daa 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -28,7 +28,6 @@ SRC_URI = "\
     file://0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch \
     file://0019-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch \
     file://0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch \
-    file://0021-lldb-Do-not-look-for-interpreter.patch \
     file://0022-Driver-Prioritize-SYSROOT-usr-include-over-RESOURCE_.patch \
     file://0023-RISCV-Add-support-for-floating-point-registers-in-in.patch \
 "