aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-17 14:58:02 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-17 14:58:02 +0000
commitd162a7ee1f77c86ddb21ea0b88f3aa34592e5112 (patch)
treeaeb3d91e43db946d6ca79e49740d51f1e8031efa /main
parentdd54bfedab2c4f228ae4ec6d40dcad600221ad26 (diff)
downloadaports-d162a7ee1f77c86ddb21ea0b88f3aa34592e5112.tar.bz2
aports-d162a7ee1f77c86ddb21ea0b88f3aa34592e5112.tar.xz
main/wpa_supplicant: fix musl build
Diffstat (limited to 'main')
-rw-r--r--main/wpa_supplicant/APKBUILD7
-rw-r--r--main/wpa_supplicant/musl-fix-types.patch19
2 files changed, 25 insertions, 1 deletions
diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD
index 85c60cb3a8..614a2b0792 100644
--- a/main/wpa_supplicant/APKBUILD
+++ b/main/wpa_supplicant/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=wpa_supplicant
pkgver=2.0
-pkgrel=2
+pkgrel=3
pkgdesc="A utility providing key negotiation for WPA wireless networks"
url="http://hostap.epitest.fi/wpa_supplicant"
arch="all"
@@ -10,6 +10,8 @@ subpackages="$pkgname-doc $pkgname-gui"
depends="dbus"
makedepends="openssl-dev dbus-dev libnl3-dev qt-dev"
source="http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
+ musl-fix-types.patch
+
wpa_supplicant.initd
wpa_supplicant.confd
"
@@ -147,11 +149,14 @@ gui() {
}
md5sums="3be2ebfdcced52e00eda0afe2889839d wpa_supplicant-2.0.tar.gz
+6023cac7f7fc6801e575f255af025368 musl-fix-types.patch
8c88d2418857028c8a8c8489b516f22a wpa_supplicant.initd
bc117427f2c538439f3f1481a028ee06 wpa_supplicant.confd"
sha256sums="2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09 wpa_supplicant-2.0.tar.gz
+2196f8850f72c5f269d2b5c1495c33e254c7c1526648e5cd4a51901205d3b45b musl-fix-types.patch
66b7fd1322540ed39120c453d6f8852b519b67e3efcb3abdc3a76733ff75ecb4 wpa_supplicant.initd
61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 wpa_supplicant.confd"
sha512sums="c3a599e1dfa5e0bb4b8d35ed49501696ce68c807ff458c1e3bff9ed5619c780f7117c6d8d7cb9a11351e9fad27cf83fc114f255c92552e7ba084de70c5f8e254 wpa_supplicant-2.0.tar.gz
+64bc462d10f99f13098554db85d514530fcb85bc93d65843d0db66493cf7b6280e22540c95846d0f6c870f6cbd95cc8d4208675775e964988d97351bc716b7df musl-fix-types.patch
12a59d1f60f61aea6733add7d8a961fb728d27c156c49481775194cc655b1cec77f021624cf6a9cd93d0e5db12ebfca315a41801f03213919cf2b896b901f3bb wpa_supplicant.initd
29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 wpa_supplicant.confd"
diff --git a/main/wpa_supplicant/musl-fix-types.patch b/main/wpa_supplicant/musl-fix-types.patch
new file mode 100644
index 0000000000..a79000d9e7
--- /dev/null
+++ b/main/wpa_supplicant/musl-fix-types.patch
@@ -0,0 +1,19 @@
+--- wpa_supplicant-2.0.orig/src/drivers/linux_wext.h
++++ wpa_supplicant-2.0/src/drivers/linux_wext.h
+@@ -21,11 +21,11 @@
+
+ #include <sys/types.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 u_int32_t __u32;
++typedef int32_t __s32;
++typedef u_int16_t __u16;
++typedef int16_t __s16;
++typedef u_int8_t __u8;
+ #ifndef __user
+ #define __user
+ #endif /* __user */