summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch42
-rw-r--r--meta/recipes-devtools/libdnf/libdnf_0.63.0.bb1
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch
new file mode 100644
index 0000000000..d483dd410b
--- /dev/null
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch
@@ -0,0 +1,42 @@
1From c0a465ccae395871ab10932975e37894220bc6a1 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 1 Jun 2021 10:23:59 +0800
4Subject: [PATCH] drop FindPythonInstDir.cmake
5
6Since commit [1] applied, PYTHON_INSTALL_DIR is not right
7on 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/
12recipe-sysroot-native/usr/lib/python3.9/site-packages
13...
14
15Yocto manually set PYTHON_INSTALL_DIR from recipe, it is not
16necessary to call FindPythonInstDir.cmake which will override
17Yocto setting
18
19[1] https://github.com/rpm-software-management/libdnf/commit/f1cffbfb9f338da827e233c2d8ac3a25a6a59a69
20
21Upstream-Status: Inappropriate [Yocto specific]
22
23Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
24---
25 cmake/modules/FindPythonInstDir.cmake | 7 +------
26 1 file changed, 1 insertion(+), 6 deletions(-)
27
28diff --git a/cmake/modules/FindPythonInstDir.cmake b/cmake/modules/FindPythonInstDir.cmake
29index 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--
412.18.1
42
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.63.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.63.0.bb
index 79e8865456..a26ee55cb9 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.63.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.63.0.bb
@@ -12,6 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
12 file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ 12 file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \
13 file://enable_test_data_dir_set.patch \ 13 file://enable_test_data_dir_set.patch \
14 file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \ 14 file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \
15 file://0001-drop-FindPythonInstDir.cmake.patch \
15 " 16 "
16 17
17SRCREV = "669a5c691acba91693d238d6262ac99a440aa9b3" 18SRCREV = "669a5c691acba91693d238d6262ac99a440aa9b3"