diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-12-18 17:29:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-03 12:35:53 +0000 |
commit | 4fe071a18f4b922d1db7216af1b810c649e51518 (patch) | |
tree | 8cc8651971362bcbbc39aa4ace1707a63d14f350 /meta/recipes-devtools | |
parent | 54363c1d9322c798a3467b088dc2fb446cd84d07 (diff) | |
download | poky-4fe071a18f4b922d1db7216af1b810c649e51518.tar.gz |
createrepo-c: update to 0.12.0
Drop 0001-Correctly-install-the-shared-library.patch as upstream fixed the issue.
(From OE-Core rev: c9447be6efc89b2d6259bcd4237af482d47b389f)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
3 files changed, 9 insertions, 40 deletions
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch deleted file mode 100644 index cd72084ee2..0000000000 --- a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From fef835e1fdedc72c97d9c3e5704302e56e1bdef0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 2 Jan 2017 17:23:59 +0200 | ||
4 | Subject: [PATCH] Correctly install the shared library | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/78] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | src/CMakeLists.txt | 3 ++- | ||
10 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
13 | index f3635e8..46dc037 100644 | ||
14 | --- a/src/CMakeLists.txt | ||
15 | +++ b/src/CMakeLists.txt | ||
16 | @@ -110,7 +110,8 @@ CONFIGURE_FILE("deltarpms.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/deltarpms.h" @ONLY) | ||
17 | IF (CMAKE_SIZEOF_VOID_P MATCHES "8") | ||
18 | SET (LIB_SUFFIX "64") | ||
19 | ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") | ||
20 | -SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") | ||
21 | +#SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") | ||
22 | +SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") | ||
23 | |||
24 | INSTALL(FILES ${headers} DESTINATION "include/createrepo_c") | ||
25 | INSTALL(FILES "createrepo_c.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") | ||
26 | -- | ||
27 | 2.11.0 | ||
28 | |||
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 9531070937..c0f07fe2ca 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 | |||
@@ -1,27 +1,25 @@ | |||
1 | From bef487b5c2515062c5dd73c21082ce42f69aa717 Mon Sep 17 00:00:00 2001 | 1 | From 4644d18157296257284bedd857f4610f1037d50e 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:31:02 +0200 | 3 | Date: Fri, 30 Dec 2016 18:31:02 +0200 |
4 | Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python | 4 | 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 | --- | 9 | --- |
9 | src/python/CMakeLists.txt | 2 +- | 10 | src/python/CMakeLists.txt | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 12 | ||
12 | 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 |
13 | index 9f1ac64..eae0cbb 100644 | 14 | index 3d873f7..e977b2f 100644 |
14 | --- a/src/python/CMakeLists.txt | 15 | --- a/src/python/CMakeLists.txt |
15 | +++ b/src/python/CMakeLists.txt | 16 | +++ b/src/python/CMakeLists.txt |
16 | @@ -19,7 +19,7 @@ else() | 17 | @@ -21,7 +21,7 @@ if (NOT SKBUILD) |
17 | FIND_PACKAGE(PythonInterp 3.0 REQUIRED) | 18 | endif () |
18 | endif() | 19 | endif (NOT SKBUILD) |
19 | 20 | ||
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) |
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 | +#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 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) | 23 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) |
23 | 24 | ||
24 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") | 25 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") |
25 | -- | ||
26 | 2.11.0 | ||
27 | |||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb index 2960811048..3a4cfb7b02 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb | |||
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
6 | 6 | ||
7 | SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ | 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 | file://0001-Correctly-install-the-shared-library.patch \ | ||
10 | " | 9 | " |
11 | 10 | ||
12 | PV = "0.11.1+git${SRCPV}" | 11 | PV = "0.12.0" |
13 | SRCREV = "434a40babdde57ab405e9a1085a30e9575ea0c92" | 12 | SRCREV = "8884a469680b7fb4a10fcbd49dbfef99b035c44b" |
14 | 13 | ||
15 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
16 | 15 | ||
@@ -19,7 +18,7 @@ DEPENDS_append_class-native = " file-replacement-native" | |||
19 | 18 | ||
20 | inherit cmake pkgconfig bash-completion distutils3-base | 19 | inherit cmake pkgconfig bash-completion distutils3-base |
21 | 20 | ||
22 | EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" | 21 | EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF" |
23 | 22 | ||
24 | BBCLASSEXTEND = "native nativesdk" | 23 | BBCLASSEXTEND = "native nativesdk" |
25 | 24 | ||