[1/1] libtirpc: fix musl build

Message ID 20180610180532.19164-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series
  • [1/1] libtirpc: fix musl build
Related show

Commit Message

Fabrice Fontaine June 10, 2018, 6:05 p.m.
Don't redefine existing typedef (u_char, u_long, ...) on musl

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../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

Comments

Thomas Petazzoni June 17, 2018, 7:26 p.m. | #1
Hello,

On Sun, 10 Jun 2018 20:05:32 +0200, Fabrice Fontaine wrote:
> Don't redefine existing typedef (u_char, u_long, ...) on musl
> 
> Fixes:
>  - http://autobuild.buildroot.net/results/dbc07e383605a84eb19a2fd1899668612212518a
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  .../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

Patch

diff --git a/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch b/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch
new file mode 100644
index 0000000000..d4bcd80991
--- /dev/null
+++ b/package/libtirpc/0006-rpc-types.h-fix-musl-build.patch
@@ -0,0 +1,31 @@ 
+From 238f0a870f577e8fffd92820e1c1a88d4fc6d35f Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+---
+ 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
+