diff options
| -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 @@ | |||
| 1 | From fc0b81bb717db3f41513f09f6661676a7aea6dd4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 9 Mar 2021 19:30:42 +0000 | ||
| 4 | Subject: [PATCH] libdnf/config.h: avoid the use of non-portable __WORDSIZE | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1159] | ||
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 8 | |||
| 9 | --- | ||
| 10 | libdnf/config.h | 9 +++------ | ||
| 11 | 1 file changed, 3 insertions(+), 6 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/libdnf/config.h b/libdnf/config.h | ||
| 14 | index 01b330b4..dbd53f5e 100644 | ||
| 15 | --- a/libdnf/config.h | ||
| 16 | +++ b/libdnf/config.h | ||
| 17 | @@ -20,14 +20,11 @@ | ||
| 18 | |||
| 19 | #ifdef __APPLE__ | ||
| 20 | #include <stdint.h> | ||
| 21 | -#else | ||
| 22 | -#include <bits/wordsize.h> | ||
| 23 | #endif | ||
| 24 | +#include <limits.h> | ||
| 25 | |||
| 26 | -#if __WORDSIZE == 32 | ||
| 27 | -#include "config-32.h" | ||
| 28 | -#elif __WORDSIZE == 64 | ||
| 29 | +#if (ULONG_MAX == 0xffffffffffffffff) | ||
| 30 | #include "config-64.h" | ||
| 31 | #else | ||
| 32 | -#error "Unknown word size" | ||
| 33 | +#include "config-32.h" | ||
| 34 | #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 \ | |||
| 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-avoid-the-use-of-non-portable-__WORD.patch \ | ||
| 15 | file://0001-drop-FindPythonInstDir.cmake.patch \ | 14 | file://0001-drop-FindPythonInstDir.cmake.patch \ |
| 16 | file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ | 15 | file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ |
| 17 | " | 16 | " |
| 18 | 17 | ||
| 19 | SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9" | 18 | SRCREV = "e5ecbc1e5062631f44cb94a3b73d9310db0ff386" |
| 20 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" | 19 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" |
| 21 | 20 | ||
| 22 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
