diff options
Diffstat (limited to 'poky/meta/recipes-devtools/libdnf')
-rw-r--r-- | poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch | 31 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb (renamed from poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb) | 3 |
2 files changed, 33 insertions, 1 deletions
diff --git a/poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch b/poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch new file mode 100644 index 000000000..f8d256e01 --- /dev/null +++ b/poky/meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch @@ -0,0 +1,31 @@ +From 8aa5402393fabaf4fff51be3af4868e8dfab6da7 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 | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/libdnf/config.h b/libdnf/config.h +index 16121f6f..2925923e 100644 +--- a/libdnf/config.h ++++ b/libdnf/config.h +@@ -18,12 +18,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include <bits/wordsize.h> ++#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/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb index b34bb5de0..dbe68d5a1 100644 --- a/poky/meta/recipes-devtools/libdnf/libdnf_0.55.2.bb +++ b/poky/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-avoid-the-use-of-non-portable-__WORD.patch \ " -SRCREV = "d2d0ec98fd2e0a2623123fb1ddf8fdd8936c6046" +SRCREV = "85278894f21bc1957dc47a2a09ddacf59bc3cda8" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" |