From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0
Date: Sun, 28 Feb 2021 16:36:46 +0100 [thread overview]
Message-ID: <20210228153702.498275-8-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20210228153702.498275-1-alex.kanavin@gmail.com>
Sdd a patch to fix musl builds.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
| 31 +++++++++++++++++++
.../{libdnf_0.55.2.bb => libdnf_0.58.0.bb} | 3 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-libdnf-config.h-include-the-correct-header-on-musl.patch
rename meta/recipes-devtools/libdnf/{libdnf_0.55.2.bb => libdnf_0.58.0.bb} (93%)
--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
similarity index 93%
rename from meta/recipes-devtools/libdnf/libdnf_0.55.2.bb
rename to 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"
--
2.29.2
next prev parent reply other threads:[~2021-02-28 15:37 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-28 15:36 [PATCH 01/24] webkit/wpe: only check even versions Alexander Kanavin
2021-02-28 15:36 ` [PATCH 02/24] bmap-tools: upgrade 3.5 -> 3.6 Alexander Kanavin
2021-02-28 18:35 ` [OE-core] " Khem Raj
2021-02-28 19:08 ` Alexander Kanavin
2021-02-28 19:20 ` Khem Raj
2021-02-28 19:23 ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 03/24] dnf: upgrade 4.5.2 -> 4.6.0 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 04/24] ccache: update 4.1 -> 4.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 05/24] dosfstools: " Alexander Kanavin
2021-02-28 18:40 ` [OE-core] " Khem Raj
2021-02-28 19:10 ` Alexander Kanavin
2021-02-28 19:20 ` Khem Raj
2021-03-01 14:32 ` Colin Finck
2021-03-01 16:57 ` [OE-core] " Alexander Kanavin
2021-03-02 13:25 ` Colin Finck
2021-03-02 13:36 ` [OE-core] " Alexander Kanavin
2021-03-03 16:16 ` Martin Jansa
2021-03-03 16:34 ` Khem Raj
2021-03-03 16:58 ` Martin Jansa
2021-03-03 17:09 ` Colin Finck
2021-03-03 17:01 ` Colin Finck
2021-03-03 16:28 ` Steve Sakoman
2021-02-28 15:36 ` [PATCH 06/24] e2fsprogs: update 1.45.7 -> 1.46.1 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 07/24] elfutils: update 0.182 -> 0.183 Alexander Kanavin
2021-02-28 15:36 ` Alexander Kanavin [this message]
2021-02-28 19:04 ` [OE-core] [PATCH 08/24] libdnf: update 0.55.2 -> 0.58.0 Khem Raj
2021-02-28 19:07 ` Alexander Kanavin
2021-02-28 19:30 ` Khem Raj
2021-03-01 11:53 ` Alexander Kanavin
2021-03-08 22:29 ` Richard Purdie
2021-03-09 19:50 ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 09/24] librepo: update 1.12.1 -> 1.13.0 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 10/24] meson: update 0.56.2 -> 0.57.1 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 11/24] perl: update 5.32.0 -> 5.32.1 Alexander Kanavin
2021-03-01 8:03 ` [OE-core] " Khem Raj
2021-03-01 22:40 ` Khem Raj
2021-03-02 9:19 ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 12/24] pango: update 1.48.0 -> 1.48.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 13/24] vulkan-samples: update to latest revision Alexander Kanavin
2021-02-28 15:36 ` [PATCH 14/24] webkitgtk: update 2.30.4 -> 2.30.5 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 15/24] libgcrypt: update 1.8.7 -> 1.9.2 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 16/24] libical: update 3.0.8 -> 3.0.9 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 17/24] pinentry: update 1.1.0 -> 1.1.1 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 18/24] procps: update 3.3.16 -> 3.3.17 Alexander Kanavin
2021-02-28 19:10 ` [OE-core] " Khem Raj
2021-03-08 22:47 ` Richard Purdie
2021-03-09 12:04 ` Alexander Kanavin
2021-02-28 15:36 ` [PATCH 19/24] libmd: add a recipe Alexander Kanavin
2021-02-28 15:36 ` [PATCH 20/24] libbsd: udpate 0.10.0 -> 0.11.3 Alexander Kanavin
2021-02-28 15:36 ` [PATCH 21/24] syslinux: use NO_INLINE_FUNCS in CFLAGS Alexander Kanavin
2021-02-28 15:37 ` [PATCH 22/24] scripts/lib/wic/partition.py: do not set FAT size Alexander Kanavin
2021-02-28 19:16 ` [OE-core] " Khem Raj
2021-02-28 19:21 ` Alexander Kanavin
2021-02-28 15:37 ` [PATCH 23/24] openssl: address ptest failures caused by perl 5.32.1 Alexander Kanavin
2021-02-28 15:37 ` [PATCH 24/24] ptest-perl/run-ptest: address " Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210228153702.498275-8-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox