mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 09:32:14 +02:00
5623065801
Drop upstreamed patch. Rebase the other patches. (From OE-Core rev: 17a537bb5d28ceb9fec0320dc18e6e3688d5993c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From 7205033e44d8fba1d3b18b490e7eaab82da1ffa3 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Fri, 30 Dec 2016 18:29:07 +0200
|
|
Subject: [PATCH 1/5] Do not set PYTHON_INSTALL_DIR by running python
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 23e5f889..650b624a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -18,7 +18,7 @@ else()
|
|
FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
|
|
endif()
|
|
|
|
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" 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())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
|
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION)
|
|
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
|
|
|
|
--
|
|
2.14.2
|
|
|