git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 5b6849d9d7e030c3a521b5245d86f853b0271a61 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 1/2] 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 ---
  11  librepo/python/python2/CMakeLists.txt | 12 ++++++------
  12  librepo/python/python3/CMakeLists.txt | 12 ++++++------
  13  2 files changed, 12 insertions(+), 12 deletions(-)
  14
  15 diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt
  16 index 5ffbd62..90d3c22 100644
  17 --- a/librepo/python/python2/CMakeLists.txt
  18 +++ b/librepo/python/python2/CMakeLists.txt
  19 @@ -1,11 +1,11 @@
  20  FIND_PACKAGE (PythonLibs 2 )
  21  FIND_PACKAGE (PythonInterp 2 REQUIRED)
  22 -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
  23 -from sys import stdout
  24 -from distutils import sysconfig
  25 -path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
  26 -stdout.write(path)"
  27 -OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
  28 +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
  29 +#from sys import stdout
  30 +#from distutils import sysconfig
  31 +#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
  32 +#stdout.write(path)"
  33 +#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
  34  INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
  35
  36  MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
  37 diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt
  38 index 47559f7..b39adc2 100644
  39 --- a/librepo/python/python3/CMakeLists.txt
  40 +++ b/librepo/python/python3/CMakeLists.txt
  41 @@ -10,12 +10,12 @@ message("--- ${PYTHON_INCLUDE_DIR}")
  42
  43  FIND_PACKAGE(PythonLibs 3.0)
  44  FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
  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 +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
  52 +#from sys import stdout
  53 +#from distutils import sysconfig
  54 +#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
  55 +#stdout.write(path)"
  56 +#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
  57  INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
  58
  59  MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}")
  60 --
  61 2.14.1
  62