diff options
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch | 17 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf_0.62.0.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.58.0.bb) | 2 |
2 files changed, 11 insertions, 8 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 index f8d256e011..b740521fda 100644 --- 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 | |||
@@ -1,23 +1,26 @@ | |||
1 | From 8aa5402393fabaf4fff51be3af4868e8dfab6da7 Mon Sep 17 00:00:00 2001 | 1 | From fc0b81bb717db3f41513f09f6661676a7aea6dd4 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 9 Mar 2021 19:30:42 +0000 | 3 | Date: Tue, 9 Mar 2021 19:30:42 +0000 |
4 | Subject: [PATCH] libdnf/config.h: avoid the use of non-portable __WORDSIZE | 4 | Subject: [PATCH] libdnf/config.h: avoid the use of non-portable __WORDSIZE |
5 | 5 | ||
6 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1159] | 6 | Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1159] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | libdnf/config.h | 8 +++----- | 10 | libdnf/config.h | 9 +++------ |
10 | 1 file changed, 3 insertions(+), 5 deletions(-) | 11 | 1 file changed, 3 insertions(+), 6 deletions(-) |
11 | 12 | ||
12 | diff --git a/libdnf/config.h b/libdnf/config.h | 13 | diff --git a/libdnf/config.h b/libdnf/config.h |
13 | index 16121f6f..2925923e 100644 | 14 | index 01b330b4..dbd53f5e 100644 |
14 | --- a/libdnf/config.h | 15 | --- a/libdnf/config.h |
15 | +++ b/libdnf/config.h | 16 | +++ b/libdnf/config.h |
16 | @@ -18,12 +18,10 @@ | 17 | @@ -20,14 +20,11 @@ |
17 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
18 | */ | ||
19 | 18 | ||
19 | #ifdef __APPLE__ | ||
20 | #include <stdint.h> | ||
21 | -#else | ||
20 | -#include <bits/wordsize.h> | 22 | -#include <bits/wordsize.h> |
23 | #endif | ||
21 | +#include <limits.h> | 24 | +#include <limits.h> |
22 | 25 | ||
23 | -#if __WORDSIZE == 32 | 26 | -#if __WORDSIZE == 32 |
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.62.0.bb index dbe68d5a15..e2c2c41c6a 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.58.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.62.0.bb | |||
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ | |||
14 | file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \ | 14 | file://0001-libdnf-config.h-avoid-the-use-of-non-portable-__WORD.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRCREV = "85278894f21bc1957dc47a2a09ddacf59bc3cda8" | 17 | SRCREV = "9a0e17562b19586b3ffa70fa93eb961b558794c7" |
18 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
19 | 19 | ||
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |