diff options
Diffstat (limited to 'meta/recipes-devtools/librepo/librepo')
3 files changed, 43 insertions, 14 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 2ea50f00ff..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,4 +1,4 @@ | |||
1 | From 82bd6d196a0453657cbacaaedd75b2d2fe0bf9ba 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. |
@@ -33,6 +33,3 @@ index 8523ca7..06e5f7b 100644 | |||
33 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) | 33 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) |
34 | 34 | ||
35 | MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") | 35 | MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") |
36 | -- | ||
37 | 2.25.1 | ||
38 | |||
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 a0a4d490f1..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 25113b34bc1aae377d7bf447e69528783e2c177e 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,25 +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 cd975a8..713cc87 100644 | 14 | index 6c00024..a2f57af 100644 |
16 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
17 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
18 | @@ -35,7 +35,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) | 17 | @@ -37,7 +37,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) |
19 | FIND_PACKAGE(CURL 7.52.0 REQUIRED) | 18 | FIND_PACKAGE(CURL 7.52.0 REQUIRED) |
20 | 19 | ||
21 | IF (USE_GPGME) | 20 | IF (USE_GPGME) |
22 | - FIND_PACKAGE(Gpgme REQUIRED) | 21 | - FIND_PACKAGE(Gpgme REQUIRED) |
23 | + PKG_CHECK_MODULES(GPGME gpgme REQUIRED) | 22 | + PKG_CHECK_MODULES(GPGME gpgme REQUIRED) |
24 | + set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) | 23 | + set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) |
25 | ELSE (USE_GPGME) | 24 | IF (ENABLE_SELINUX) |
26 | PKG_CHECK_MODULES(RPM REQUIRED rpm>=4.18.0) | 25 | PKG_CHECK_MODULES(SELINUX REQUIRED libselinux) |
27 | ENDIF (USE_GPGME) | 26 | ENDIF(ENABLE_SELINUX) |
28 | -- | ||
29 | 2.34.1 | ||
30 | |||