summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2011-12-03 17:03:30 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-12-26 07:42:00 (GMT)
commit2ed19cb1debbf31407ea3d704ce921d1b51ac13f (patch)
treee7ea73b7be6309158c41efaa6d54a924d9794bc4
parent11f7a7b4fb676ae6db33c03402e624ad5b5d6968 (diff)
downloadbuildroot-2ed19cb1debbf31407ea3d704ce921d1b51ac13f.tar.gz
buildroot-2ed19cb1debbf31407ea3d704ce921d1b51ac13f.tar.bz2
wpa_supplicant: fix build with new libnl-3
The CFLAGS have to be augmented for the include dir and a small patch will make the binary link to libnl-3 and libnl-genl-3 instead of libnl and libnl-gen. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch15
-rw-r--r--package/wpa_supplicant/wpa_supplicant.mk2
2 files changed, 16 insertions, 1 deletions
diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
new file mode 100644
index 0000000..a460c2a
--- /dev/null
+++ b/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
@@ -0,0 +1,15 @@
+--- a/src/drivers/drivers.mak 2011-11-29 19:19:56.684221050 +0100
++++ b/src/drivers/drivers.mak 2011-11-29 19:20:12.199609246 +0100
+@@ -31,10 +31,10 @@
+ NEED_AP_MLME=y
+ NEED_NETLINK=y
+ NEED_LINUX_IOCTL=y
+-DRV_LIBS += -lnl
++DRV_LIBS += -lnl-3
+
+ ifdef CONFIG_LIBNL20
+-DRV_LIBS += -lnl-genl
++DRV_LIBS += -lnl-genl-3
+ DRV_CFLAGS += -DCONFIG_LIBNL20
+ endif
+ endif
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index baa739b..f722b81 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -66,7 +66,7 @@ endif
define WPA_SUPPLICANT_CONFIGURE_CMDS
cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
- echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
+ echo "CFLAGS += $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(WPA_SUPPLICANT_CONFIG)
echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG)
$(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG)