On 2/28/21 7:36 AM, Alexander Kanavin wrote:
Sdd a patch to fix musl builds.
^^^
typo here
Signed-off-by: Alexander Kanavin <[email protected]>
---
...h-include-the-correct-header-on-musl.patch | 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%)
diff --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 <[email protected]>
+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 <[email protected]>
+---
+ 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
It seems __WORDISIZE is what is being used here, a portable way would be
#include <limits.h>
#if (ULONG_MAX == 0xffffffffffffffff)
64bit wordlen stuff
#else
32bit stuff
#endif
if we still want to keep using internal libc internal define __WORDSIZE
then for musl include sys/user.h headers under bits/ dir are usually not
portable and not meant for direct includes
#include <features.h>
#ifdef __GLIBC__
#include <bits/wordsize.h>
#endif
#include <sys/user.h>
+
+ #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"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#148764):
https://lists.openembedded.org/g/openembedded-core/message/148764
Mute This Topic: https://lists.openembedded.org/mt/80974301/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
