diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-10-04 17:33:37 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-21 16:26:55 +0000 |
| commit | 7b77824462edbdf978df5dd56bfeab78ac47bb6c (patch) | |
| tree | 07876aa2f1ce4b66e5a289e172742524872b6e41 /meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | |
| parent | 564ae957b81911bb69315f230a9757a303deec0a (diff) | |
| download | openembedded-core-7b77824462edbdf978df5dd56bfeab78ac47bb6c.tar.gz | |
librepo: update to 1.8.1
Drop upstreamed patches, rebase the PYTHON_INSTALL_DIR patch.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
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 | 49 |
1 files changed, 35 insertions, 14 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 7138dfce21..d69deb5110 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,41 +1,62 @@ -From 1570ad33dd7e5d83f3ee80bd104b114709ac1e34 Mon Sep 17 00:00:00 2001 +From 5b6849d9d7e030c3a521b5245d86f853b0271a61 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Dec 2016 18:05:36 +0200 -Subject: [PATCH 2/4] Do not try to obtain PYTHON_INSTALL_DIR by running +Subject: [PATCH 1/2] Do not try to obtain PYTHON_INSTALL_DIR by running python. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - librepo/python/python2/CMakeLists.txt | 2 +- - librepo/python/python3/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + librepo/python/python2/CMakeLists.txt | 12 ++++++------ + librepo/python/python3/CMakeLists.txt | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt -index 3615e17..cffa99f 100644 +index 5ffbd62..90d3c22 100644 --- a/librepo/python/python2/CMakeLists.txt +++ b/librepo/python/python2/CMakeLists.txt -@@ -1,6 +1,6 @@ +@@ -1,11 +1,11 @@ FIND_PACKAGE (PythonLibs 2 ) FIND_PACKAGE (PythonInterp 2 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) +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " +-from sys import stdout +-from distutils import sysconfig +-path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') +-stdout.write(path)" +-OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " ++#from sys import stdout ++#from distutils import sysconfig ++#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') ++#stdout.write(path)" ++#OUTPUT_VARIABLE PYTHON_INSTALL_DIR) INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt -index dfecac9..38bcc72 100644 +index 47559f7..b39adc2 100644 --- a/librepo/python/python3/CMakeLists.txt +++ b/librepo/python/python3/CMakeLists.txt -@@ -10,7 +10,7 @@ message("--- ${PYTHON_INCLUDE_DIR}") +@@ -10,12 +10,12 @@ message("--- ${PYTHON_INCLUDE_DIR}") FIND_PACKAGE(PythonLibs 3.0) FIND_PACKAGE(PythonInterp 3.0 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) +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " +-from sys import stdout +-from distutils import sysconfig +-path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') +-stdout.write(path)" +-OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " ++#from sys import stdout ++#from distutils import sysconfig ++#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') ++#stdout.write(path)" ++#OUTPUT_VARIABLE PYTHON_INSTALL_DIR) INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") -- -2.11.0 +2.14.1 |