summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorzhengruoqin <zhengrq.fnst@fujitsu.com>2021-06-17 18:29:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-17 22:20:44 +0100
commitf39fa79699dc724558ade61e68d81d308b26c4ce (patch)
tree0893c8c74b3ecfef9a5cda198851ca926e2341ea /meta/recipes-devtools
parent446788bef3c7e1f1a353daf7230a97c0b30557d5 (diff)
downloadpoky-f39fa79699dc724558ade61e68d81d308b26c4ce.tar.gz
libcomps: upgrade 0.1.16 -> 0.1.17
refresh 0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch (From OE-Core rev: 34afce294aece8c2d411181b9fb372afb5da7375) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch10
-rw-r--r--meta/recipes-devtools/libcomps/libcomps_0.1.17.bb (renamed from meta/recipes-devtools/libcomps/libcomps_0.1.16.bb)2
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
index 3e9102605b..6cd052889a 100644
--- a/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
+++ b/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
@@ -10,18 +10,18 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt 12diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt
13index b9b96ab..6d44567 100644 13index f813af4..9eebb6c 100644
14--- a/libcomps/src/python/src/CMakeLists.txt 14--- a/libcomps/src/python/src/CMakeLists.txt
15+++ b/libcomps/src/python/src/CMakeLists.txt 15+++ b/libcomps/src/python/src/CMakeLists.txt
16@@ -115,7 +115,7 @@ IF (SKBUILD) 16@@ -85,7 +85,7 @@ IF (SKBUILD)
17 INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps) 17 INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps)
18 INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps) 18 INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps)
19 ELSE () 19 ELSE ()
20- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) 20- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
21+ #EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) 21+ #EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
22 22
23 INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps) 23 INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps)
24 #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION 24 #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
25-- 25--
262.26.2 262.25.1
27 27
diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.16.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.17.bb
index 851ec5b817..502bc4688b 100644
--- a/meta/recipes-devtools/libcomps/libcomps_0.1.16.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_0.1.17.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
9 file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ 9 file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
10 " 10 "
11 11
12SRCREV = "f3289ed1d812648558ab48ade4fae850b375fa65" 12SRCREV = "dfaffdce1969042bda4a184865861573bb07a5a3"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15