diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-05-06 09:24:31 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-23 11:40:46 +0100 |
commit | 07d53f0a28a065e39b1f7b62608aa78db9c80c57 (patch) | |
tree | 95bcb72de2f59d67d8352819fc611e2d6246c9cc /meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | |
parent | 74bf6213deea76963590e9c85b08a0bb661217da (diff) | |
download | poky-07d53f0a28a065e39b1f7b62608aa78db9c80c57.tar.gz |
libcomps: update to 0.1.15
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>
Diffstat (limited to 'meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch')
-rw-r--r-- | meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch new file mode 100644 index 0000000000..3e9102605b --- /dev/null +++ b/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 32447a79e24f8e7e9e0150eb747f34116d63ef38 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 30 Dec 2016 18:22:09 +0200 | ||
4 | Subject: [PATCH 2/2] Do not set 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 | libcomps/src/python/src/CMakeLists.txt | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt | ||
13 | index b9b96ab..6d44567 100644 | ||
14 | --- a/libcomps/src/python/src/CMakeLists.txt | ||
15 | +++ b/libcomps/src/python/src/CMakeLists.txt | ||
16 | @@ -115,7 +115,7 @@ IF (SKBUILD) | ||
17 | INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps) | ||
18 | INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps) | ||
19 | ELSE () | ||
20 | - 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) | ||
21 | + #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) | ||
22 | |||
23 | INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps) | ||
24 | #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION | ||
25 | -- | ||
26 | 2.26.2 | ||
27 | |||