From: Felix Fietkau Date: Mon, 5 Oct 2009 16:50:13 +0000 (+0000) Subject: xsupplicant: fix compile errors related to iwlib.h X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=8862869422ca68429cebb5c3bf047b2ce0586fe5 xsupplicant: fix compile errors related to iwlib.h SVN-Revision: 17896 --- diff --git a/net/xsupplicant/Makefile b/net/xsupplicant/Makefile index 03296e53cd..ec56621a52 100644 --- a/net/xsupplicant/Makefile +++ b/net/xsupplicant/Makefile @@ -36,6 +36,8 @@ define Package/xsupplicant/conffiles /etc/xsupplicant.conf endef +TARGET_CFLAGS += --std=gnu99 + CONFIGURE_ARGS+= \ --with-openssl="$(STAGING_DIR)/usr" \ --with-madwifi-path="$(STAGING_DIR)/usr/include/madwifi" \ diff --git a/net/xsupplicant/patches/004-linux_2.6.19_wireless_h.patch b/net/xsupplicant/patches/004-linux_2.6.19_wireless_h.patch deleted file mode 100644 index 97e610c158..0000000000 --- a/net/xsupplicant/patches/004-linux_2.6.19_wireless_h.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/configure -+++ b/configure -@@ -4759,6 +4759,11 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifndef __user - #define __user - #endif -+ #include -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) -+ #include -+ #include -+ #endif - #include - - #include <$ac_header> -@@ -4823,6 +4828,11 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifndef __user - #define __user - #endif -+ #include -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) -+ #include -+ #include -+ #endif - #include - #include - int ---- a/configure.in -+++ b/configure.in -@@ -119,6 +119,11 @@ if test $SYSTEM = "Linux"; then - #ifndef __user - #define __user - #endif -+ #include -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) -+ #include -+ #include -+ #endif - #include ]) - - AC_MSG_CHECKING([iwlib version]) -@@ -127,6 +132,11 @@ if test $SYSTEM = "Linux"; then - #ifndef __user - #define __user - #endif -+ #include -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) -+ #include -+ #include -+ #endif - #include - #include ], - [iw_extract_event_stream(NULL, NULL, 0);], [AC_DEFINE(NEW_IWLIB) AC_MSG_RESULT([3 params])], [AC_MSG_RESULT([2 params])]) ---- a/src/cardif/linux/cardif_linux_wext.c -+++ b/src/cardif/linux/cardif_linux_wext.c -@@ -204,6 +204,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/net/xsupplicant/patches/005-no_private_linux_header_includes.patch b/net/xsupplicant/patches/005-no_private_linux_header_includes.patch index 5c675987b5..3caf9289b8 100644 --- a/net/xsupplicant/patches/005-no_private_linux_header_includes.patch +++ b/net/xsupplicant/patches/005-no_private_linux_header_includes.patch @@ -43,6 +43,6 @@ Index: xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c #include #include -#include - #include #include #include + #include diff --git a/net/xsupplicant/patches/006-no_wireless_h.patch b/net/xsupplicant/patches/006-no_wireless_h.patch index 8a9319318d..378e21f0d3 100644 --- a/net/xsupplicant/patches/006-no_wireless_h.patch +++ b/net/xsupplicant/patches/006-no_wireless_h.patch @@ -1,46 +1,5 @@ -diff -urN xsupplicant-1.2.8/configure xsupplicant-1.2.8.new/configure ---- xsupplicant-1.2.8/configure 2009-05-12 15:12:47.000000000 +0200 -+++ xsupplicant-1.2.8.new/configure 2009-05-12 15:13:29.000000000 +0200 -@@ -4764,7 +4764,6 @@ - #include - #include - #endif -- #include - - #include <$ac_header> - _ACEOF -@@ -4833,7 +4832,6 @@ - #include - #include - #endif -- #include - #include - int - main () -diff -urN xsupplicant-1.2.8/configure.in xsupplicant-1.2.8.new/configure.in ---- xsupplicant-1.2.8/configure.in 2009-05-12 15:12:47.000000000 +0200 -+++ xsupplicant-1.2.8.new/configure.in 2009-05-12 15:13:57.000000000 +0200 -@@ -123,8 +123,7 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) - #include - #include -- #endif -- #include ]) -+ #endif]) - - AC_MSG_CHECKING([iwlib version]) - AC_TRY_COMPILE([#define HEADERS_KERNEL -@@ -137,7 +136,6 @@ - #include - #include - #endif -- #include - #include ], - [iw_extract_event_stream(NULL, NULL, 0);], [AC_DEFINE(NEW_IWLIB) AC_MSG_RESULT([3 params])], [AC_MSG_RESULT([2 params])]) - fi -diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_atmel_driver.c ---- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c 2009-05-12 15:12:47.000000000 +0200 -+++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_atmel_driver.c 2009-05-12 15:14:30.000000000 +0200 +--- a/src/cardif/linux/cardif_atmel_driver.c ++++ b/src/cardif/linux/cardif_atmel_driver.c @@ -109,7 +109,6 @@ #include #include @@ -49,9 +8,8 @@ diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1 #ifdef USE_EFENCE #include -diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux.c ---- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c 2009-05-12 15:12:47.000000000 +0200 -+++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux.c 2009-05-12 15:14:40.000000000 +0200 +--- a/src/cardif/linux/cardif_linux.c ++++ b/src/cardif/linux/cardif_linux.c @@ -180,7 +180,6 @@ #include #include @@ -60,25 +18,44 @@ diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.ne #include "xsupconfig.h" #include "profile.h" -diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_rtnetlink.c ---- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c 2009-05-12 15:12:47.000000000 +0200 -+++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_rtnetlink.c 2009-05-12 15:14:47.000000000 +0200 -@@ -210,7 +210,6 @@ - #include +--- a/src/cardif/linux/cardif_linux_rtnetlink.c ++++ b/src/cardif/linux/cardif_linux_rtnetlink.c +@@ -207,10 +207,8 @@ + #include + #include "netlink.h" + #include "rtnetlink.h" +-#include #include #include -#include #include "profile.h" #include "xsupconfig.h" -diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_wext.c ---- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c 2009-05-12 15:12:47.000000000 +0200 -+++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_wext.c 2009-05-12 15:14:58.000000000 +0200 -@@ -204,7 +204,6 @@ +--- a/src/cardif/linux/cardif_linux_wext.c ++++ b/src/cardif/linux/cardif_linux_wext.c +@@ -203,7 +203,6 @@ + #include #include #include - #include -#include #include #include #include +--- a/configure ++++ b/configure +@@ -4759,7 +4759,6 @@ cat >>conftest.$ac_ext <<_ACEOF + #ifndef __user + #define __user + #endif +- #include + + #include <$ac_header> + _ACEOF +@@ -4823,7 +4822,6 @@ cat >>conftest.$ac_ext <<_ACEOF + #ifndef __user + #define __user + #endif +- #include + #include + int + main ()