Skip to contentSkip to conversation

libtirpc: fix musl build

PATCH New Fabrice Fontaine 2 participants 2 messages Jun 10, 2018 – Jun 17, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 libtirpc: fix musl build

Don't redefine existing typedef (u_char, u_long, ...) on musl

Fixes:
- http://autobuild.buildroot.net/results/dbc07e383605a84eb19a2fd1899668612212518a

Signed-off-by Fabrice Fontaine <[email protected]>
---
 .../libtirpc/0006-rpc-types.h-fix-musl-build.patch | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/libtirpc/0006-rpc-types.h-fix-musl-build.patch
package/libtirpc/0006-rpc-types.h-fix-musl-build.patch new file +31 -0
new file mode 100644
index 0000000000..d4bcd80991
@@ -0,0 +1,31 @@
+From 238f0a870f577e8fffd92820e1c1a88d4fc6d35f Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 10 Jun 2018 19:48:21 +0200
+Subject: [PATCH] rpc/types.h: fix musl build
+
+Don't redefine existing typedef (u_char, u_long, ...) on musl
+
+Fixes:
+ - http://autobuild.buildroot.net/results/dbc07e383605a84eb19a2fd1899668612212518a
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ tirpc/rpc/types.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tirpc/rpc/types.h b/tirpc/rpc/types.h
+index f069efa..0153a5c 100644
+--- a/tirpc/rpc/types.h
++++ b/tirpc/rpc/types.h
+@@ -66,7 +66,7 @@ typedef   int32_t rpc_inline_t;
+ #define mem_free(ptr, bsize)	free(ptr)
+ 
+ 
+-#if defined __APPLE_CC__ || defined __FreeBSD__
++#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined (__GLIBC__)
+ # define __u_char_defined
+ # define __daddr_t_defined
+ #endif
+-- 
+2.14.1
+
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH 1/1 libtirpc: fix musl build

Hello,

Quoted 10 lines · Fabrice Fontaine

Don't redefine existing typedef (u_char, u_long, ...) on musl

Fixes:
- http://autobuild.buildroot.net/results/dbc07e383605a84eb19a2fd1899668612212518a

Signed-off-by Fabrice Fontaine <[email protected]>
---
 .../libtirpc/0006-rpc-types.h-fix-musl-build.patch | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/libtirpc/0006-rpc-types.h-fix-musl-build.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com