summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-02-28 16:36:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 10:30:39 +0000
commitd3ffc00752712c169ad8515f5648bc892805a339 (patch)
treeeba90e8134d0e8f56ba02b222df1c173c1652a90 /meta
parentd7522c859db317430dc9baacd21657e744d09d7e (diff)
downloadpoky-d3ffc00752712c169ad8515f5648bc892805a339.tar.gz
libdnf: update 0.55.2 -> 0.58.0
Sdd a patch to fix musl builds. (From OE-Core rev: 559410af0496465f9fbe5e87849b42859328959e) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch31
-rw-r--r--meta/recipes-devtools/libdnf/libdnf_0.58.0.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.55.2.bb)3
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch b/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch
new file mode 100644
index 0000000000..734521bb3f
--- /dev/null
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch
@@ -0,0 +1,31 @@
1From 8cc7ada0161a7af38351d1e70516975402f3c5c5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 26 Feb 2021 18:37:41 +0000
4Subject: [PATCH] libdnf/config.h: include the correct header on musl
5
6Problem reported at https://github.com/rpm-software-management/libdnf/issues/1146,
7but this patch isn't quite the fix.
8
9Upstream-Status: Inappropriate
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 libdnf/config.h | 5 +++++
13 1 file changed, 5 insertions(+)
14
15diff --git a/libdnf/config.h b/libdnf/config.h
16index 16121f6f..51623ce4 100644
17--- a/libdnf/config.h
18+++ b/libdnf/config.h
19@@ -18,7 +18,12 @@
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 */
22
23+#include <features.h>
24+#ifdef __GLIBC__
25 #include <bits/wordsize.h>
26+#else
27+#include <bits/reg.h>
28+#endif
29
30 #if __WORDSIZE == 32
31 #include "config-32.h"
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb b/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb
index b34bb5de01..eea410af4c 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb
@@ -11,9 +11,10 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \
11 file://0001-Add-WITH_TESTS-option.patch \ 11 file://0001-Add-WITH_TESTS-option.patch \
12 file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ 12 file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \
13 file://enable_test_data_dir_set.patch \ 13 file://enable_test_data_dir_set.patch \
14 file://0001-libdnf-config.h-include-the-correct-header-on-musl.patch \
14 " 15 "
15 16
16SRCREV = "d2d0ec98fd2e0a2623123fb1ddf8fdd8936c6046" 17SRCREV = "85278894f21bc1957dc47a2a09ddacf59bc3cda8"
17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 18UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
18 19
19S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"