| Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 1 | From c0a465ccae395871ab10932975e37894220bc6a1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 1 Jun 2021 10:23:59 +0800 |
| 4 | Subject: [PATCH] drop FindPythonInstDir.cmake |
| 5 | |
| 6 | Since commit [1] applied, PYTHON_INSTALL_DIR is not right |
| 7 | on nativesdk build |
| 8 | ... |
| 9 | |Building for python3 |
| 10 | |-- Python install dir is |
| 11 | |tmp-glibc/work/x86_64-nativesdk-wrlinuxsdk-linux/nativesdk-libdnf/0.63.0-r0/ |
| 12 | recipe-sysroot-native/usr/lib/python3.9/site-packages |
| 13 | ... |
| 14 | |
| 15 | Yocto manually set PYTHON_INSTALL_DIR from recipe, it is not |
| 16 | necessary to call FindPythonInstDir.cmake which will override |
| 17 | Yocto setting |
| 18 | |
| 19 | [1] https://github.com/rpm-software-management/libdnf/commit/f1cffbfb9f338da827e233c2d8ac3a25a6a59a69 |
| 20 | |
| 21 | Upstream-Status: Inappropriate [Yocto specific] |
| 22 | |
| 23 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 24 | --- |
| 25 | cmake/modules/FindPythonInstDir.cmake | 7 +------ |
| 26 | 1 file changed, 1 insertion(+), 6 deletions(-) |
| 27 | |
| 28 | diff --git a/cmake/modules/FindPythonInstDir.cmake b/cmake/modules/FindPythonInstDir.cmake |
| 29 | index ed098ded..8b137891 100644 |
| 30 | --- a/cmake/modules/FindPythonInstDir.cmake |
| 31 | +++ b/cmake/modules/FindPythonInstDir.cmake |
| 32 | @@ -1,6 +1 @@ |
| 33 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " |
| 34 | -from sys import stdout |
| 35 | -from sysconfig import get_path |
| 36 | -path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'}) |
| 37 | -stdout.write(path)" |
| 38 | -OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
| 39 | + |
| 40 | -- |
| 41 | 2.18.1 |
| 42 | |