diff mbox series

[2/2] package/libtirpc: fix build when missing <bits/endian.h>

Message ID 20200228173052.5128-2-petr.vorel@gmail.com
State Superseded
Headers show
Series [1/2] package/libtirpc: fix build with gcc 10 | expand

Commit Message

Petr Vorel Feb. 28, 2020, 5:30 p.m. UTC
This fixes build on riscv64:

http://autobuild.buildroot.net/results/a334f774e95fb7805568fc3868d5cf1d790a6e73
http://autobuild.buildroot.net/results/9cf80bdd4d329788c89596b56205ef215ee09c35

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 ...r_float-do-not-include-bits-endian.h.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/libtirpc/0006-xdr_float-do-not-include-bits-endian.h.patch

Comments

Thomas Petazzoni March 3, 2020, 9:56 p.m. UTC | #1
On Fri, 28 Feb 2020 18:30:52 +0100
Petr Vorel <petr.vorel@gmail.com> wrote:

> This fixes build on riscv64:
> 
> http://autobuild.buildroot.net/results/a334f774e95fb7805568fc3868d5cf1d790a6e73
> http://autobuild.buildroot.net/results/9cf80bdd4d329788c89596b56205ef215ee09c35
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
>  ...r_float-do-not-include-bits-endian.h.patch | 33 +++++++++++++++++++
>  1 file changed, 33 insertions(+)
>  create mode 100644 package/libtirpc/0006-xdr_float-do-not-include-bits-endian.h.patch

This issue seems to be happening only on the next branch. Why? Anything
special in next compared to master?

Thomas
Petr Vorel March 5, 2020, 4:39 a.m. UTC | #2
Hi Thomas,

> This issue seems to be happening only on the next branch. Why? Anything
> special in next compared to master?
No idea why, libtirpc itself it's the same. It'd help if I could find builds for
master, but autobuild search doesn't help to search packages, which does not
fail, there is only search for failed packages:

http://autobuild.buildroot.net/index.php?reason=libtirpc-1.2.5

Is it running for master?

Kind regards,
Petr
Petr Vorel March 23, 2020, 6:24 p.m. UTC | #3
Hi Thomas,

> > This issue seems to be happening only on the next branch. Why? Anything
> > special in next compared to master?
Now, the error got propagated to the master, it'll fix failures on riscv64 and
arm:

http://autobuild.buildroot.net/results/4f423c95e290ec99fec263a839e3336362e7003c
http://autobuild.buildroot.net/results/04fdf097b9aeda2e831c9138110b527e1e6ee5ea
http://autobuild.buildroot.net/results/531156fd470eeb287e1761c5f0c17c68fe1e7888
http://autobuild.buildroot.net/results/678cd9b11160e3995e61afc8579b579702429ef5
http://autobuild.buildroot.net/results/940e4212a7d029e6495af3d5cacc8e3bbc9e78ff

You can merge it with previous one (gcc-10 fix [1]), or I can sent v2 with just
this patch (then I'd rename patch number from 6 to 5).

Kind regards,
Petr

[1] https://patchwork.ozlabs.org/patch/1246746/
diff mbox series

Patch

diff --git a/package/libtirpc/0006-xdr_float-do-not-include-bits-endian.h.patch b/package/libtirpc/0006-xdr_float-do-not-include-bits-endian.h.patch
new file mode 100644
index 0000000000..2527726015
--- /dev/null
+++ b/package/libtirpc/0006-xdr_float-do-not-include-bits-endian.h.patch
@@ -0,0 +1,33 @@ 
+From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Tue, 21 Jan 2020 11:51:16 -0500
+Subject: [PATCH 2/2] xdr_float: do not include bits/endian.h
+
+bits/endian.h is an internal header. endian.h should be included.
+
+Fixes compilation with recent musl.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
+[ upstream status: d04f4d6f0e682f16b0ce96839ab4eadade591eb1 ]
+---
+ src/xdr_float.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xdr_float.c b/src/xdr_float.c
+index 26bc865..349d48f 100644
+--- a/src/xdr_float.c
++++ b/src/xdr_float.c
+@@ -83,7 +83,7 @@ static struct sgl_limits {
+ };
+ #else
+ 
+-#include <bits/endian.h>
++#include <endian.h>
+ #define IEEEFP
+ 
+ #endif /* vax */
+-- 
+2.25.1
+