diff options
| -rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | 11 | ||||
| -rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb (renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.17.2.bb) | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 4b844574ea..b63fe53944 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch | |||
| @@ -5,21 +5,24 @@ Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python | |||
| 5 | 5 | ||
| 6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 8 | 8 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | |
| 9 | --- | 9 | --- |
| 10 | src/python/CMakeLists.txt | 2 +- | 10 | src/python/CMakeLists.txt | 2 +- |
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 | 12 | ||
| 13 | diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt | 13 | diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt |
| 14 | index ecc262d..a86514c 100644 | 14 | index a31b14d..01fd8ca 100644 |
| 15 | --- a/src/python/CMakeLists.txt | 15 | --- a/src/python/CMakeLists.txt |
| 16 | +++ b/src/python/CMakeLists.txt | 16 | +++ b/src/python/CMakeLists.txt |
| 17 | @@ -14,7 +14,7 @@ if (NOT SKBUILD) | 17 | @@ -14,7 +14,7 @@ if (NOT SKBUILD) |
| 18 | FIND_PACKAGE(PythonLibs 3 REQUIRED) | 18 | FIND_PACKAGE(PythonLibs 3 REQUIRED) |
| 19 | endif (NOT SKBUILD) | 19 | endif (NOT SKBUILD) |
| 20 | 20 | ||
| 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) | 21 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
| 22 | +#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 | +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
| 23 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) | 23 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) |
| 24 | 24 | ||
| 25 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") | 25 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") |
| 26 | -- | ||
| 27 | 2.25.1 | ||
| 28 | |||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.2.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb index 76bdd69836..481c4bff29 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.2.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb | |||
| @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ | |||
| 8 | file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ | 8 | file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ |
| 9 | " | 9 | " |
| 10 | 10 | ||
| 11 | SRCREV = "8eff6ed99f5fd0ba844cb8513963435caab5fd3c" | 11 | SRCREV = "8196982f0974c268898a5550d61b374bd58103e2" |
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
| 14 | 14 | ||
