mirror of
https://git.yoctoproject.org/poky
synced 2026-02-22 09:29:40 +01:00
07d53f0a28
In this update the 0001-Make-__comps_objmrtree_all-static-inline.patch was mainlined by commit 18f52cb. Furthermore mainline commit 3237f44 fixes a build problem with the default "-fno-common" of gcc 10. (From OE-Core rev: 55e2f218de2725d65b2cf231b6e835eb94f8eceb) Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 90b942d01decbcff3b883ee6fb4bba67fb446817) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
From 32447a79e24f8e7e9e0150eb747f34116d63ef38 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 2/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/CMakeLists.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt
|
|
index b9b96ab..6d44567 100644
|
|
--- a/libcomps/src/python/src/CMakeLists.txt
|
|
+++ b/libcomps/src/python/src/CMakeLists.txt
|
|
@@ -115,7 +115,7 @@ IF (SKBUILD)
|
|
INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps)
|
|
INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps)
|
|
ELSE ()
|
|
- 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)
|
|
|
|
INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps)
|
|
#INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
|
|
--
|
|
2.26.2
|
|
|