mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

libcomps: update to 0.1.12

Browse Source 
(From OE-Core rev: ccff8acaff0f31211653128d7e22ba7a8ddcb185)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-11-29 14:11:51 +01:00
committed by Richard Purdie
parent e8543db1c6
commit c96f31006d
2 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
+17 -33
View File
@@ -1,41 +1,25 @@
From ff4aae4c8beaf17cb8e7a3431f6c541eccfae244 Mon Sep 17 00:00:00 2001 From b28859ea93110d52d8a87d7b5a6c8796d0d523ed Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 30 Dec 2016 18:22:09 +0200 Date: Fri, 30 Dec 2016 18:22:09 +0200
Subject: [PATCH 1/2] Do not set PYTHON_INSTALL_DIR by running python. Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python.
Upstream-Status: Inappropriate [oe-core specific] Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
libcomps/src/python/src/python2/CMakeLists.txt | 2 +- libcomps/src/python/src/CMakeLists.txt | 2 +-
libcomps/src/python/src/python3/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libcomps/src/python/src/python2/CMakeLists.txt b/libcomps/src/python/src/python2/CMakeLists.txt diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt
index 3ad9e18..0e7dd4b 100644 index fa590ae..6913214 100644
--- a/libcomps/src/python/src/python2/CMakeLists.txt --- a/libcomps/src/python/src/CMakeLists.txt
+++ b/libcomps/src/python/src/python2/CMakeLists.txt +++ b/libcomps/src/python/src/CMakeLists.txt
@@ -1,7 +1,7 @@ @@ -117,7 +117,7 @@ IF (SKBUILD)
find_package (PythonLibs 2.6) INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps)
find_package (PythonInterp 2.6 REQUIRED) INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps)
ELSE ()
- 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)
+ #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)
-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) INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps)
+#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) #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
include_directories(${PYTHON_INCLUDE_PATH})
include_directories(${LIBCOMPS_INCLUDE_PATH})
diff --git a/libcomps/src/python/src/python3/CMakeLists.txt b/libcomps/src/python/src/python3/CMakeLists.txt
index 7fafa9f..ed82d3d 100644
--- a/libcomps/src/python/src/python3/CMakeLists.txt
+++ b/libcomps/src/python/src/python3/CMakeLists.txt
@@ -2,7 +2,7 @@ find_package (PythonLibs 3.0)
find_package (PythonInterp 3.0)
#add_custom_target(py3-copy)
-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)
+#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)
include_directories(${PYTHON_INCLUDE_PATH})
include_directories(${LIBCOMPS_INCLUDE_PATH})
--
2.11.0
meta/recipes-devtools/libcomps/libcomps_git.bb
+2 -2
View File
@@ -8,8 +8,8 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
file://0001-Add-crc32.c-to-sources-list.patch \ file://0001-Add-crc32.c-to-sources-list.patch \
" "
PV = "0.1.11" PV = "0.1.12"
SRCREV = "d868a79b76fb980d1371c28124ae07f00d2b63a9" SRCREV = "d0c8aa312dcab75c265ed6123f8afe0d7c8e91db"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"