diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-11 11:40:48 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 11:48:35 +0100 |
| commit | ea8562459425e54f5809ff00dba133ff7e30d2b5 (patch) | |
| tree | 7b0679e6a72b54b4b85b4dae2eb4f7442b644164 | |
| parent | 0f07360ebcab7e337c1cb9b9a7a844b102bd5e15 (diff) | |
| download | openembedded-core-contrib-ea8562459425e54f5809ff00dba133ff7e30d2b5.tar.gz | |
libdnf: update 0.63.1 -> 0.64.0
Drop patch merged upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-devtools/libdnf/libdnf_0.64.0.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.63.1.bb) | 3 |
2 files changed, 1 insertions, 36 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch b/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch deleted file mode 100644 index b740521fda..0000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fc0b81bb717db3f41513f09f6661676a7aea6dd4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 9 Mar 2021 19:30:42 +0000 -Subject: [PATCH] libdnf/config.h: avoid the use of non-portable __WORDSIZE - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1159] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - libdnf/config.h | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/libdnf/config.h b/libdnf/config.h -index 01b330b4..dbd53f5e 100644 ---- a/libdnf/config.h -+++ b/libdnf/config.h -@@ -20,14 +20,11 @@ - - #ifdef __APPLE__ - #include <stdint.h> --#else --#include <bits/wordsize.h> - #endif -+#include <limits.h> - --#if __WORDSIZE == 32 --#include "config-32.h" --#elif __WORDSIZE == 64 -+#if (ULONG_MAX == 0xffffffffffffffff) - #include "config-64.h" - #else --#error "Unknown word size" -+#include "config-32.h" - #endif diff --git a/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.64.0.bb index a9f393e722..38d3307b11 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.64.0.bb @@ -11,12 +11,11 @@ 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-avoid-the-use-of-non-portable-__WORD.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ " -SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9" +SRCREV = "e5ecbc1e5062631f44cb94a3b73d9310db0ff386" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git" |