diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-02-28 16:36:46 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-10 10:29:23 +0000 |
| commit | 559410af0496465f9fbe5e87849b42859328959e (patch) | |
| tree | 8487039f5caf696300a6efad6b32629ed751760b /meta | |
| parent | 6e96939b65ad9d1435ae0dfd8303f0ed8c429cee (diff) | |
| download | openembedded-core-contrib-559410af0496465f9fbe5e87849b42859328959e.tar.gz | |
libdnf: update 0.55.2 -> 0.58.0
Sdd a patch to fix musl builds.
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.patch | 31 | ||||
| -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 @@ +From 8cc7ada0161a7af38351d1e70516975402f3c5c5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 26 Feb 2021 18:37:41 +0000 +Subject: [PATCH] libdnf/config.h: include the correct header on musl + +Problem reported at https://github.com/rpm-software-management/libdnf/issues/1146, +but this patch isn't quite the fix. + +Upstream-Status: Inappropriate +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + libdnf/config.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libdnf/config.h b/libdnf/config.h +index 16121f6f..51623ce4 100644 +--- a/libdnf/config.h ++++ b/libdnf/config.h +@@ -18,7 +18,12 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <features.h> ++#ifdef __GLIBC__ + #include <bits/wordsize.h> ++#else ++#include <bits/reg.h> ++#endif + + #if __WORDSIZE == 32 + #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 \ file://0001-Add-WITH_TESTS-option.patch \ file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ file://enable_test_data_dir_set.patch \ + file://0001-libdnf-config.h-include-the-correct-header-on-musl.patch \ " -SRCREV = "d2d0ec98fd2e0a2623123fb1ddf8fdd8936c6046" +SRCREV = "85278894f21bc1957dc47a2a09ddacf59bc3cda8" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" |