diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-11-21 14:57:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-22 12:02:57 +0000 |
commit | cafdd25de0c09d0b09110b640ed9d4b82d42e06e (patch) | |
tree | 93f04212877a188b296df8c1c04d3d69d0821e11 /meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | |
parent | 27467678ae76ea44b37431da5e250ddcf8746099 (diff) | |
download | poky-cafdd25de0c09d0b09110b640ed9d4b82d42e06e.tar.gz |
librepo: update to 1.9.2
expat dependency has been replaced by libxml
(From OE-Core rev: 6eeda04126009d5ab216d8178d8cbb0a22318bc5)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch')
-rw-r--r-- | meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch index d69deb5110..b61f0c9324 100644 --- a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch +++ b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 5b6849d9d7e030c3a521b5245d86f853b0271a61 Mon Sep 17 00:00:00 2001 | 1 | From b08a3b71e716dd0485ef51036d32e4c304fb4e67 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 30 Dec 2016 18:05:36 +0200 | 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 | 4 | Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python. |
5 | python. | ||
6 | 5 | ||
7 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
@@ -13,12 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
13 | 2 files changed, 12 insertions(+), 12 deletions(-) | 12 | 2 files changed, 12 insertions(+), 12 deletions(-) |
14 | 13 | ||
15 | diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt | 14 | diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt |
16 | index 5ffbd62..90d3c22 100644 | 15 | index a0f1f9a..1665079 100644 |
17 | --- a/librepo/python/python2/CMakeLists.txt | 16 | --- a/librepo/python/python2/CMakeLists.txt |
18 | +++ b/librepo/python/python2/CMakeLists.txt | 17 | +++ b/librepo/python/python2/CMakeLists.txt |
19 | @@ -1,11 +1,11 @@ | 18 | @@ -1,9 +1,9 @@ |
20 | FIND_PACKAGE (PythonLibs 2 ) | ||
21 | FIND_PACKAGE (PythonInterp 2 REQUIRED) | ||
22 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " | 19 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " |
23 | -from sys import stdout | 20 | -from sys import stdout |
24 | -from distutils import sysconfig | 21 | -from distutils import sysconfig |
@@ -35,13 +32,10 @@ index 5ffbd62..90d3c22 100644 | |||
35 | 32 | ||
36 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") | 33 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") |
37 | diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt | 34 | diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt |
38 | index 47559f7..b39adc2 100644 | 35 | index 52ba44e..da51e10 100644 |
39 | --- a/librepo/python/python3/CMakeLists.txt | 36 | --- a/librepo/python/python3/CMakeLists.txt |
40 | +++ b/librepo/python/python3/CMakeLists.txt | 37 | +++ b/librepo/python/python3/CMakeLists.txt |
41 | @@ -10,12 +10,12 @@ message("--- ${PYTHON_INCLUDE_DIR}") | 38 | @@ -1,9 +1,9 @@ |
42 | |||
43 | FIND_PACKAGE(PythonLibs 3.0) | ||
44 | FIND_PACKAGE(PythonInterp 3.0 REQUIRED) | ||
45 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " | 39 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " |
46 | -from sys import stdout | 40 | -from sys import stdout |
47 | -from distutils import sysconfig | 41 | -from distutils import sysconfig |
@@ -57,6 +51,3 @@ index 47559f7..b39adc2 100644 | |||
57 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) | 51 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) |
58 | 52 | ||
59 | MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") | 53 | MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") |
60 | -- | ||
61 | 2.14.1 | ||
62 | |||