Skip to contentSkip to conversation

package/wpa_supplicant: Add patch to fix build error with musl

PATCH New Jörg Krause 2 participants 3 messages Dec 3, 2014 – Dec 7, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/wpa_supplicant: Add patch to fix build error with musl

Add a patch to allow building wpa_supplicant with the musl C library.

Building wpa_supplicant with the musl C library fails since musl does not define type names such as '__uint32_t'. To support building wpa_supplicant with the musl C library use the integer types declared in the ISO C standard header file <stdint.h>.

Patch is sent upstream:
http://lists.shmoo.com/pipermail/hostap/2014-December/031464.html

---
 .../wpa_supplicant-0001-fix-musl-build-error.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/wpa_supplicant/wpa_supplicant-0001-fix-musl-build-error.patch
package/wpa_supplicant/wpa_supplicant-0001-fix-musl-build-error.patch new file +45 -0
new file mode 100644
index 0000000..08f63df
@@ -0,0 +1,45 @@
+From ccc079dc16e70844bb28e84d00bd26b61ecc755c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]>
+Date: Wed, 3 Dec 2014 22:29:29 +0100
+Subject: [PATCH 1/1] fix musl build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building wpa_supplicant with the musl C library fails since musl does not
+define type names such as '__uint32_t'. To support building wpa_supplicant
+with the musl C library use the integer types declared in the ISO C standard
+header file <stdint.h>.
+
+Signed-off-by: J?rg Krause <[email protected]>
+---
+ src/drivers/linux_wext.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/drivers/linux_wext.h b/src/drivers/linux_wext.h
+index 55cf955..e7c7001 100644
+--- a/src/drivers/linux_wext.h
++++ b/src/drivers/linux_wext.h
+@@ -19,13 +19,13 @@
+ #define _LINUX_SOCKET_H
+ #define _LINUX_IF_H
+ 
+-#include <sys/types.h>
++#include <stdint.h>
+ #include <net/if.h>
+-typedef __uint32_t __u32;
+-typedef __int32_t __s32;
+-typedef __uint16_t __u16;
+-typedef __int16_t __s16;
+-typedef __uint8_t __u8;
++typedef uint32_t __u32;
++typedef int32_t __s32;
++typedef uint16_t __u16;
++typedef int16_t __s16;
++typedef uint8_t __u8;
+ #ifndef __user
+ #define __user
+ #endif /* __user */
+-- 
+2.1.3
+
Signature · 1 line
2.1.3
#1 lore raw

PATCH 1/1 package/wpa_supplicant: Add patch to fix build error with musl

Dear J?rg Krause,

Quoted 7 lines · J?rg Krause

Add a patch to allow building wpa_supplicant with the musl C library.

Building wpa_supplicant with the musl C library fails since musl does not define type names such as '__uint32_t'. To support building wpa_supplicant with the musl C library use the integer types declared in the ISO C standard header file <stdint.h>.

Quoted 8 lines

Patch is sent upstream:
http://lists.shmoo.com/pipermail/hostap/2014-December/031464.html

---
 .../wpa_supplicant-0001-fix-musl-build-error.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/wpa_supplicant/wpa_supplicant-0001-fix-musl-build-error.patch

wpa_supplicant indeed doesn't build with musl without this patch, and builds fine with this patch applied. And the patch looks sane.

Thanks,

Thomas

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

PATCH 1/1 package/wpa_supplicant: Add patch to fix build error with musl

In reply to Jörg Krause

Dear J?rg Krause,

Quoted 11 lines · J?rg Krause

Add a patch to allow building wpa_supplicant with the musl C library.

Building wpa_supplicant with the musl C library fails since musl does not define type names such as '__uint32_t'. To support building wpa_supplicant with the musl C library use the integer types declared in the ISO C standard header file <stdint.h>.

Patch is sent upstream:
http://lists.shmoo.com/pipermail/hostap/2014-December/031464.html

Applied, thanks.

Thomas

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