code.ossystems Code Review - openembedded-core.git/blob

   1 From b08a3b71e716dd0485ef51036d32e4c304fb4e67 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] Do not try to obtain 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 ---
  10  librepo/python/python2/CMakeLists.txt | 12 ++++++------
  11  librepo/python/python3/CMakeLists.txt | 12 ++++++------
  12  2 files changed, 12 insertions(+), 12 deletions(-)
  13
  14 diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt
  15 index a0f1f9a..1665079 100644
  16 --- a/librepo/python/python2/CMakeLists.txt
  17 +++ b/librepo/python/python2/CMakeLists.txt
  18 @@ -1,9 +1,9 @@
  19 -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
  20 -from sys import stdout
  21 -from distutils import sysconfig
  22 -path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
  23 -stdout.write(path)"
  24 -OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
  25 +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
  26 +#from sys import stdout
  27 +#from distutils import sysconfig
  28 +#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
  29 +#stdout.write(path)"
  30 +#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
  31  INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
  32
  33  MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
  34 diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt
  35 index 52ba44e..da51e10 100644
  36 --- a/librepo/python/python3/CMakeLists.txt
  37 +++ b/librepo/python/python3/CMakeLists.txt
  38 @@ -1,9 +1,9 @@
  39 -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
  40 -from sys import stdout
  41 -from distutils import sysconfig
  42 -path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
  43 -stdout.write(path)"
  44 -OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
  45 +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
  46 +#from sys import stdout
  47 +#from distutils import sysconfig
  48 +#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
  49 +#stdout.write(path)"
  50 +#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
  51  INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
  52
  53  MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}")