summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libcomps
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/libcomps')
-rw-r--r--meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch50
-rw-r--r--meta/recipes-devtools/libcomps/libcomps_git.bb4
2 files changed, 19 insertions, 35 deletions
diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
index 26e8b06f37..59c09aa70a 100644
--- a/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
+++ b/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
@@ -1,41 +1,25 @@
1From ff4aae4c8beaf17cb8e7a3431f6c541eccfae244 Mon Sep 17 00:00:00 2001 1From b28859ea93110d52d8a87d7b5a6c8796d0d523ed Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:22:09 +0200 3Date: Fri, 30 Dec 2016 18:22:09 +0200
4Subject: [PATCH 1/2] Do not set PYTHON_INSTALL_DIR by running python. 4Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python.
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 libcomps/src/python/src/python2/CMakeLists.txt | 2 +- 10 libcomps/src/python/src/CMakeLists.txt | 2 +-
10 libcomps/src/python/src/python3/CMakeLists.txt | 2 +- 11 1 file changed, 1 insertion(+), 1 deletion(-)
11 2 files changed, 2 insertions(+), 2 deletions(-)
12 12
13diff --git a/libcomps/src/python/src/python2/CMakeLists.txt b/libcomps/src/python/src/python2/CMakeLists.txt 13diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt
14index 3ad9e18..0e7dd4b 100644 14index fa590ae..6913214 100644
15--- a/libcomps/src/python/src/python2/CMakeLists.txt 15--- a/libcomps/src/python/src/CMakeLists.txt
16+++ b/libcomps/src/python/src/python2/CMakeLists.txt 16+++ b/libcomps/src/python/src/CMakeLists.txt
17@@ -1,7 +1,7 @@ 17@@ -117,7 +117,7 @@ IF (SKBUILD)
18 find_package (PythonLibs 2.6) 18 INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps)
19 find_package (PythonInterp 2.6 REQUIRED) 19 INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps)
20 20 ELSE ()
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 distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
22+#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) 22+ #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)
23
24 include_directories(${PYTHON_INCLUDE_PATH})
25 include_directories(${LIBCOMPS_INCLUDE_PATH})
26diff --git a/libcomps/src/python/src/python3/CMakeLists.txt b/libcomps/src/python/src/python3/CMakeLists.txt
27index 7fafa9f..ed82d3d 100644
28--- a/libcomps/src/python/src/python3/CMakeLists.txt
29+++ b/libcomps/src/python/src/python3/CMakeLists.txt
30@@ -2,7 +2,7 @@ find_package (PythonLibs 3.0)
31 find_package (PythonInterp 3.0)
32 #add_custom_target(py3-copy)
33 23
34-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) 24 INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps)
35+#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) 25 #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
36
37 include_directories(${PYTHON_INCLUDE_PATH})
38 include_directories(${LIBCOMPS_INCLUDE_PATH})
39--
402.11.0
41
diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_git.bb
index 372c3c3580..34881bba37 100644
--- a/meta/recipes-devtools/libcomps/libcomps_git.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_git.bb
@@ -8,8 +8,8 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
8 file://0001-Add-crc32.c-to-sources-list.patch \ 8 file://0001-Add-crc32.c-to-sources-list.patch \
9 " 9 "
10 10
11PV = "0.1.11" 11PV = "0.1.12"
12SRCREV = "d868a79b76fb980d1371c28124ae07f00d2b63a9" 12SRCREV = "d0c8aa312dcab75c265ed6123f8afe0d7c8e91db"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15