Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 1 | From 1570ad33dd7e5d83f3ee80bd104b114709ac1e34 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 30 Dec 2016 18:05:36 +0200 |
| 4 | Subject: [PATCH 2/4] Do not try to obtain PYTHON_INSTALL_DIR by running |
| 5 | python. |
| 6 | |
| 7 | Upstream-Status: Inappropriate [oe-core specific] |
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 9 | --- |
| 10 | librepo/python/python2/CMakeLists.txt | 2 +- |
| 11 | librepo/python/python3/CMakeLists.txt | 2 +- |
| 12 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt |
| 15 | index 3615e17..cffa99f 100644 |
| 16 | --- a/librepo/python/python2/CMakeLists.txt |
| 17 | +++ b/librepo/python/python2/CMakeLists.txt |
| 18 | @@ -1,6 +1,6 @@ |
| 19 | FIND_PACKAGE (PythonLibs 2 ) |
| 20 | FIND_PACKAGE (PythonInterp 2 REQUIRED) |
| 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 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) |
| 24 | |
| 25 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") |
| 26 | diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt |
| 27 | index dfecac9..38bcc72 100644 |
| 28 | --- a/librepo/python/python3/CMakeLists.txt |
| 29 | +++ b/librepo/python/python3/CMakeLists.txt |
| 30 | @@ -10,7 +10,7 @@ message("--- ${PYTHON_INCLUDE_DIR}") |
| 31 | |
| 32 | FIND_PACKAGE(PythonLibs 3.0) |
| 33 | FIND_PACKAGE(PythonInterp 3.0 REQUIRED) |
| 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 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) |
| 37 | |
| 38 | MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") |
| 39 | -- |
| 40 | 2.11.0 |
| 41 | |