mirror of
https://git.yoctoproject.org/poky
synced 2026-02-22 17:39:39 +01:00
b3d13e058a
libcomps is required by dnf. (From OE-Core rev: a47e64d985a610535449730806651f5bfd75d9ec) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
42 lines
2.1 KiB
Diff
42 lines
2.1 KiB
Diff
From ff4aae4c8beaf17cb8e7a3431f6c541eccfae244 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Fri, 30 Dec 2016 18:22:09 +0200
|
|
Subject: [PATCH 1/2] Do not set PYTHON_INSTALL_DIR by running python.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
---
|
|
libcomps/src/python/src/python2/CMakeLists.txt | 2 +-
|
|
libcomps/src/python/src/python3/CMakeLists.txt | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libcomps/src/python/src/python2/CMakeLists.txt b/libcomps/src/python/src/python2/CMakeLists.txt
|
|
index 3ad9e18..0e7dd4b 100644
|
|
--- a/libcomps/src/python/src/python2/CMakeLists.txt
|
|
+++ b/libcomps/src/python/src/python2/CMakeLists.txt
|
|
@@ -1,7 +1,7 @@
|
|
find_package (PythonLibs 2.6)
|
|
find_package (PythonInterp 2.6 REQUIRED)
|
|
|
|
-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)
|
|
+#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)
|
|
|
|
include_directories(${PYTHON_INCLUDE_PATH})
|
|
include_directories(${LIBCOMPS_INCLUDE_PATH})
|
|
diff --git a/libcomps/src/python/src/python3/CMakeLists.txt b/libcomps/src/python/src/python3/CMakeLists.txt
|
|
index 7fafa9f..ed82d3d 100644
|
|
--- a/libcomps/src/python/src/python3/CMakeLists.txt
|
|
+++ b/libcomps/src/python/src/python3/CMakeLists.txt
|
|
@@ -2,7 +2,7 @@ find_package (PythonLibs 3.0)
|
|
find_package (PythonInterp 3.0)
|
|
#add_custom_target(py3-copy)
|
|
|
|
-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)
|
|
+#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)
|
|
|
|
include_directories(${PYTHON_INCLUDE_PATH})
|
|
include_directories(${LIBCOMPS_INCLUDE_PATH})
|
|
--
|
|
2.11.0
|
|
|