Skip to contentSkip to conversation

package/wipe: fix musl build

PATCH Superseded Bernd Kuhls 3 participants 3 messages Jan 31, 2016 – Feb 7, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/wipe: fix musl build

The build error was not yet found by the autobuilders:

In file included from main.c:46:0:
rand.h:31:9: error: unknown type name ?u_int32_t?

 typedef u_int32_t u_rand_t;
         ^

<builtin>: recipe for target 'main.o' failed

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/wipe/0001-musl.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/wipe/0001-musl.patch
package/wipe/0001-musl.patch new file +28 -0
new file mode 100644
index 0000000..35b3af8
@@ -0,0 +1,28 @@
+Fix musl build
+
+In file included from main.c:46:0:
+rand.h:31:9: error: unknown type name ?u_int32_t?
+ typedef u_int32_t u_rand_t;
+         ^
+<builtin>: recipe for target 'main.o' failed
+
+Patch sent upstream: https://sourceforge.net/p/wipe/patches/4/
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr wipe-2.3.1.org/rand.h wipe-2.3.1/rand.h
+--- wipe-2.3.1.org/rand.h	2003-12-03 04:01:02.000000000 +0100
++++ wipe-2.3.1/rand.h	2016-01-31 21:39:54.000000000 +0100
+@@ -22,10 +22,9 @@
+ 
+ #ifdef HAVE_STDINT_H
+ # include "stdint.h"
+-#else
+-# ifndef LINUX
++#endif
++#if !defined(u_int32_t)
+ #  define u_int32_t uint32_t
+-# endif
+ #endif
+ 
+ typedef u_int32_t u_rand_t;
Signature · 1 line
2.7.0
#1 lore raw

PATCH 1/1 package/wipe: fix musl build

Quoted 36 lines · Bernd Kuhls

The build error was not yet found by the autobuilders:

In file included from main.c:46:0:
rand.h:31:9: error: unknown type name ?u_int32_t?

 typedef u_int32_t u_rand_t;
         ^

<builtin>: recipe for target 'main.o' failed

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/wipe/0001-musl.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/wipe/0001-musl.patch
package/wipe/0001-musl.patch new file +16 -0
new file mode 100644
index 0000000..35b3af8
@@ -0,0 +1,28 @@
+Fix musl build
+
+In file included from main.c:46:0:
+rand.h:31:9: error: unknown type name ?u_int32_t?
+ typedef u_int32_t u_rand_t;
+         ^
+<builtin>: recipe for target 'main.o' failed
+
+Patch sent upstream: https://sourceforge.net/p/wipe/patches/4/
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr wipe-2.3.1.org/rand.h wipe-2.3.1/rand.h
+--- wipe-2.3.1.org/rand.h	2003-12-03 04:01:02.000000000 +0100
++++ wipe-2.3.1/rand.h	2016-01-31 21:39:54.000000000 +0100
+@@ -22,10 +22,9 @@

package/wipe/0001-musl.patch line 26

Quoted 10 lines
package/wipe/0001-musl.patch new file +10 -0
+ 
+ #ifdef HAVE_STDINT_H
+ # include "stdint.h"
+-#else
+-# ifndef LINUX
++#endif
++#if !defined(u_int32_t)
+ #  define u_int32_t uint32_t
+-# endif
+ #endif

Wouldn't it be better to use uint32_t everywhere?

However, since the project hasn't had any activity since 2009, I don't think we
can expect much from upstream, so this quick-and-dirty patch should be OK.

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 3 lines
package/wipe/0001-musl.patch new file +2 -0
+ 
+ typedef u_int32_t u_rand_t;
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Applied
#2 lore raw

PATCH 1/1 package/wipe: fix musl build

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 6 lines · Bernd Kuhls

The build error was not yet found by the autobuilders:

In file included from main.c:46:0:
rand.h:31:9: error: unknown type name ?u_int32_t?

 typedef u_int32_t u_rand_t;
         ^
Quoted 7 lines

<builtin>: recipe for target 'main.o' failed

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/wipe/0001-musl.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/wipe/0001-musl.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com