diff options
Diffstat (limited to 'meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch')
-rw-r--r-- | meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 41 |
1 files changed, 41 insertions, 0 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 new file mode 100644 index 0000000000..26e8b06f37 --- /dev/null +++ b/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From ff4aae4c8beaf17cb8e7a3431f6c541eccfae244 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 30 Dec 2016 18:22:09 +0200 | ||
4 | Subject: [PATCH 1/2] Do not set PYTHON_INSTALL_DIR by running python. | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | libcomps/src/python/src/python2/CMakeLists.txt | 2 +- | ||
10 | libcomps/src/python/src/python3/CMakeLists.txt | 2 +- | ||
11 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/libcomps/src/python/src/python2/CMakeLists.txt b/libcomps/src/python/src/python2/CMakeLists.txt | ||
14 | index 3ad9e18..0e7dd4b 100644 | ||
15 | --- a/libcomps/src/python/src/python2/CMakeLists.txt | ||
16 | +++ b/libcomps/src/python/src/python2/CMakeLists.txt | ||
17 | @@ -1,7 +1,7 @@ | ||
18 | find_package (PythonLibs 2.6) | ||
19 | find_package (PythonInterp 2.6 REQUIRED) | ||
20 | |||
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) | ||
23 | |||
24 | include_directories(${PYTHON_INCLUDE_PATH}) | ||
25 | include_directories(${LIBCOMPS_INCLUDE_PATH}) | ||
26 | diff --git a/libcomps/src/python/src/python3/CMakeLists.txt b/libcomps/src/python/src/python3/CMakeLists.txt | ||
27 | index 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 | |||
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) | ||
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) | ||
36 | |||
37 | include_directories(${PYTHON_INCLUDE_PATH}) | ||
38 | include_directories(${LIBCOMPS_INCLUDE_PATH}) | ||
39 | -- | ||
40 | 2.11.0 | ||
41 | |||