diff options
Diffstat (limited to 'meta/recipes-devtools/librepo')
-rw-r--r-- | meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | 48 | ||||
-rw-r--r-- | meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/librepo/librepo_1.17.0.bb (renamed from meta/recipes-devtools/librepo/librepo_1.12.1.bb) | 10 |
4 files changed, 68 insertions, 49 deletions
diff --git a/meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch b/meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch new file mode 100644 index 0000000000..8727b181b3 --- /dev/null +++ b/meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From b525cdec3051d1c6ff0c3cd38bf3070b18d6fb50 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 6 Mar 2024 10:13:38 +0100 | ||
4 | Subject: [PATCH] gpg_gpgme.c: fix build errors with older gcc | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | When selinux is not enabled, older gcc versions error out this way: | ||
10 | |||
11 | | /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/hosttools/gcc -DG_LOG_DOMAIN=\"librepo\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -Dlibrepo_EXPORTS -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/libmount -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/blkid -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/glib-2.0 -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib/glib-2.0/include -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/libxml2 -isystem/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/include -O2 -pipe -std=c99 -Wall -fPIC -MD -MT librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o -MF librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o.d -o librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o -c /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c | ||
12 | | /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c: In function ‘lr_gpg_ensure_socket_dir_exists’: | ||
13 | | /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c:135:1: error: label at end of compound statement | ||
14 | | 135 | exit: | ||
15 | | | ^~~~ | ||
16 | |||
17 | Ensuring the exit: block is not empty fixes the issue. | ||
18 | |||
19 | Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/300] | ||
20 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
21 | --- | ||
22 | librepo/gpg_gpgme.c | 1 + | ||
23 | 1 file changed, 1 insertion(+) | ||
24 | |||
25 | diff --git a/librepo/gpg_gpgme.c b/librepo/gpg_gpgme.c | ||
26 | index c4addb2..47c3153 100644 | ||
27 | --- a/librepo/gpg_gpgme.c | ||
28 | +++ b/librepo/gpg_gpgme.c | ||
29 | @@ -144,6 +144,7 @@ exit: | ||
30 | } | ||
31 | freecon(old_default_context); | ||
32 | #endif | ||
33 | + return; | ||
34 | } | ||
35 | |||
36 | static gpgme_ctx_t | ||
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 b61f0c9324..4a851ad1e2 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,51 +1,33 @@ | |||
1 | From b08a3b71e716dd0485ef51036d32e4c304fb4e67 Mon Sep 17 00:00:00 2001 | 1 | From 76052aa40c61580869472fd3f009a4ab1620b998 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] Do not try to obtain PYTHON_INSTALL_DIR by running python. | 4 | Subject: [PATCH] Do not try to obtain 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 | librepo/python/python2/CMakeLists.txt | 12 ++++++------ | 10 | librepo/python/CMakeLists.txt | 12 ++++++------ |
11 | librepo/python/python3/CMakeLists.txt | 12 ++++++------ | 11 | 1 file changed, 6 insertions(+), 6 deletions(-) |
12 | 2 files changed, 12 insertions(+), 12 deletions(-) | ||
13 | 12 | ||
14 | diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt | 13 | diff --git a/librepo/python/CMakeLists.txt b/librepo/python/CMakeLists.txt |
15 | index a0f1f9a..1665079 100644 | 14 | index 8523ca7..06e5f7b 100644 |
16 | --- a/librepo/python/python2/CMakeLists.txt | 15 | --- a/librepo/python/CMakeLists.txt |
17 | +++ b/librepo/python/python2/CMakeLists.txt | 16 | +++ b/librepo/python/CMakeLists.txt |
18 | @@ -1,9 +1,9 @@ | 17 | @@ -16,12 +16,12 @@ SET (librepomodule_SRCS |
19 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " | 18 | |
20 | -from sys import stdout | 19 | MESSAGE("Building python bindings") |
21 | -from distutils import sysconfig | ||
22 | -path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') | ||
23 | -stdout.write(path)" | ||
24 | -OUTPUT_VARIABLE PYTHON_INSTALL_DIR) | ||
25 | +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " | ||
26 | +#from sys import stdout | ||
27 | +#from distutils import sysconfig | ||
28 | +#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') | ||
29 | +#stdout.write(path)" | ||
30 | +#OUTPUT_VARIABLE PYTHON_INSTALL_DIR) | ||
31 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) | ||
32 | 20 | ||
33 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") | ||
34 | diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt | ||
35 | index 52ba44e..da51e10 100644 | ||
36 | --- a/librepo/python/python3/CMakeLists.txt | ||
37 | +++ b/librepo/python/python3/CMakeLists.txt | ||
38 | @@ -1,9 +1,9 @@ | ||
39 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " | 21 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " |
40 | -from sys import stdout | 22 | -from sys import stdout |
41 | -from distutils import sysconfig | 23 | -from sysconfig import get_path |
42 | -path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') | 24 | -path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'}) |
43 | -stdout.write(path)" | 25 | -stdout.write(path)" |
44 | -OUTPUT_VARIABLE PYTHON_INSTALL_DIR) | 26 | -OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
45 | +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " | 27 | +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " |
46 | +#from sys import stdout | 28 | +#from sys import stdout |
47 | +#from distutils import sysconfig | 29 | +#from sysconfig import get_path |
48 | +#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') | 30 | +#path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'}) |
49 | +#stdout.write(path)" | 31 | +#stdout.write(path)" |
50 | +#OUTPUT_VARIABLE PYTHON_INSTALL_DIR) | 32 | +#OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
51 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) | 33 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) |
diff --git a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch index 73902e5f58..fd1df95473 100644 --- a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +++ b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f5a1dfe4c87c228165bc25e7fe464120d8139a3d Mon Sep 17 00:00:00 2001 | 1 | From b5918f06d790dc346d41de4b3a3ec01f290c1d25 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:23:27 +0200 | 3 | Date: Fri, 30 Dec 2016 18:23:27 +0200 |
4 | Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module | 4 | Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module |
@@ -6,22 +6,21 @@ Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module | |||
6 | 6 | ||
7 | Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] | 7 | Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | |||
10 | --- | 9 | --- |
11 | CMakeLists.txt | 3 ++- | 10 | CMakeLists.txt | 3 ++- |
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
13 | 12 | ||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
15 | index e949dbe..c954b2e 100644 | 14 | index 6c00024..a2f57af 100644 |
16 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
17 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
18 | @@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) | 17 | @@ -37,7 +37,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) |
19 | PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) | 18 | FIND_PACKAGE(CURL 7.52.0 REQUIRED) |
20 | PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) | ||
21 | FIND_PACKAGE(CURL REQUIRED) | ||
22 | -FIND_PACKAGE(Gpgme REQUIRED) | ||
23 | +PKG_CHECK_MODULES(GPGME gpgme REQUIRED) | ||
24 | +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) | ||
25 | |||
26 | 19 | ||
27 | IF (WITH_ZCHUNK) | 20 | IF (USE_GPGME) |
21 | - FIND_PACKAGE(Gpgme REQUIRED) | ||
22 | + PKG_CHECK_MODULES(GPGME gpgme REQUIRED) | ||
23 | + set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) | ||
24 | IF (ENABLE_SELINUX) | ||
25 | PKG_CHECK_MODULES(SELINUX REQUIRED libselinux) | ||
26 | ENDIF(ENABLE_SELINUX) | ||
diff --git a/meta/recipes-devtools/librepo/librepo_1.12.1.bb b/meta/recipes-devtools/librepo/librepo_1.17.0.bb index e90928d2ed..810191459d 100644 --- a/meta/recipes-devtools/librepo/librepo_1.12.1.bb +++ b/meta/recipes-devtools/librepo/librepo_1.17.0.bb | |||
@@ -2,21 +2,22 @@ SUMMARY = "A library providing C and Python (libcURL like) API \ | |||
2 | for downloading linux repository metadata and packages." | 2 | for downloading linux repository metadata and packages." |
3 | HOMEPAGE = "https://github.com/rpm-software-management/librepo" | 3 | HOMEPAGE = "https://github.com/rpm-software-management/librepo" |
4 | DESCRIPTION = "${SUMMARY}" | 4 | DESCRIPTION = "${SUMMARY}" |
5 | LICENSE = "LGPLv2.1" | 5 | LICENSE = "LGPL-2.1-only" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/rpm-software-management/librepo.git \ | 8 | SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \ |
9 | file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ | 9 | file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ |
10 | file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ | 10 | file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ |
11 | file://0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRCREV = "d4ad350291f2937c0b6a3eea9e1d0c8e1051fc32" | 14 | SRCREV = "ae727d99086f70f39fba5695af5460e1da908c1b" |
14 | 15 | ||
15 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
16 | 17 | ||
17 | DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" | 18 | DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" |
18 | 19 | ||
19 | inherit cmake distutils3-base pkgconfig | 20 | inherit cmake setuptools3-base pkgconfig |
20 | 21 | ||
21 | EXTRA_OECMAKE = " \ | 22 | EXTRA_OECMAKE = " \ |
22 | -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ | 23 | -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ |
@@ -24,6 +25,7 @@ EXTRA_OECMAKE = " \ | |||
24 | -DENABLE_TESTS=OFF \ | 25 | -DENABLE_TESTS=OFF \ |
25 | -DENABLE_DOCS=OFF \ | 26 | -DENABLE_DOCS=OFF \ |
26 | -DWITH_ZCHUNK=OFF \ | 27 | -DWITH_ZCHUNK=OFF \ |
28 | -DENABLE_SELINUX=OFF \ | ||
27 | " | 29 | " |
28 | 30 | ||
29 | BBCLASSEXTEND = "native nativesdk" | 31 | BBCLASSEXTEND = "native nativesdk" |