Changeset 17896


Ignore:
Timestamp:
2009-10-05T18:50:13+02:00 (7 years ago)
Author:
nbd
Message:

xsupplicant: fix compile errors related to iwlib.h

Location:
packages/net/xsupplicant
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/xsupplicant/Makefile

    r15999 r17896  
    3737endef 
    3838 
     39TARGET_CFLAGS += --std=gnu99 
     40 
    3941CONFIGURE_ARGS+= \ 
    4042        --with-openssl="$(STAGING_DIR)/usr" \ 
  • packages/net/xsupplicant/patches/005-no_private_linux_header_includes.patch

    r13972 r17896  
    4444 #include <linux/socket.h> 
    4545-#include <linux/compiler.h> 
    46  #include <linux/if.h> 
    4746 #include <linux/wireless.h> 
    4847 #include <iwlib.h> 
     48 #include <linux/if_packet.h> 
  • packages/net/xsupplicant/patches/006-no_wireless_h.patch

    r15800 r17896  
    1 diff -urN xsupplicant-1.2.8/configure xsupplicant-1.2.8.new/configure 
    2 --- xsupplicant-1.2.8/configure 2009-05-12 15:12:47.000000000 +0200 
    3 +++ xsupplicant-1.2.8.new/configure     2009-05-12 15:13:29.000000000 +0200 
    4 @@ -4764,7 +4764,6 @@ 
    5     #include <linux/types.h> 
    6     #include <linux/if.h> 
    7     #endif 
    8 -   #include <linux/wireless.h> 
    9   
    10  #include <$ac_header> 
    11  _ACEOF 
    12 @@ -4833,7 +4832,6 @@ 
    13                    #include <linux/types.h> 
    14                    #include <linux/if.h> 
    15                    #endif 
    16 -                   #include <linux/wireless.h> 
    17                     #include <iwlib.h> 
    18  int 
    19  main () 
    20 diff -urN xsupplicant-1.2.8/configure.in xsupplicant-1.2.8.new/configure.in 
    21 --- xsupplicant-1.2.8/configure.in      2009-05-12 15:12:47.000000000 +0200 
    22 +++ xsupplicant-1.2.8.new/configure.in  2009-05-12 15:13:57.000000000 +0200 
    23 @@ -123,8 +123,7 @@ 
    24     #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) 
    25     #include <linux/types.h> 
    26     #include <linux/if.h> 
    27 -   #endif 
    28 -   #include <linux/wireless.h>]) 
    29 +   #endif]) 
    30   
    31     AC_MSG_CHECKING([iwlib version]) 
    32     AC_TRY_COMPILE([#define HEADERS_KERNEL 
    33 @@ -137,7 +136,6 @@ 
    34                    #include <linux/types.h> 
    35                    #include <linux/if.h> 
    36                    #endif 
    37 -                   #include <linux/wireless.h> 
    38                     #include <iwlib.h>],  
    39                 [iw_extract_event_stream(NULL, NULL, 0);], [AC_DEFINE(NEW_IWLIB) AC_MSG_RESULT([3 params])], [AC_MSG_RESULT([2 params])]) 
    40  fi 
    41 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 
    42 --- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c    2009-05-12 15:12:47.000000000 +0200 
    43 +++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_atmel_driver.c        2009-05-12 15:14:30.000000000 +0200 
     1--- a/src/cardif/linux/cardif_atmel_driver.c 
     2+++ b/src/cardif/linux/cardif_atmel_driver.c 
    443@@ -109,7 +109,6 @@ 
    454 #include <unistd.h> 
     
    509 #ifdef USE_EFENCE 
    5110 #include <efence.h> 
    52 diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux.c 
    53 --- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c   2009-05-12 15:12:47.000000000 +0200 
    54 +++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux.c       2009-05-12 15:14:40.000000000 +0200 
     11--- a/src/cardif/linux/cardif_linux.c 
     12+++ b/src/cardif/linux/cardif_linux.c 
    5513@@ -180,7 +180,6 @@ 
    5614 #include <errno.h> 
     
    6119 #include "xsupconfig.h" 
    6220 #include "profile.h" 
    63 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 
    64 --- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c 2009-05-12 15:12:47.000000000 +0200 
    65 +++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_rtnetlink.c     2009-05-12 15:14:47.000000000 +0200 
    66 @@ -210,7 +210,6 @@ 
    67  #include <linux/if.h> 
     21--- a/src/cardif/linux/cardif_linux_rtnetlink.c 
     22+++ b/src/cardif/linux/cardif_linux_rtnetlink.c 
     23@@ -207,10 +207,8 @@ 
     24 #include <sys/ioctl.h> 
     25 #include "netlink.h" 
     26 #include "rtnetlink.h" 
     27-#include <linux/if.h> 
    6828 #include <linux/if_packet.h> 
    6929 #include <math.h> 
     
    7232 #include "profile.h" 
    7333 #include "xsupconfig.h" 
    74 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 
    75 --- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c      2009-05-12 15:12:47.000000000 +0200 
    76 +++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_wext.c  2009-05-12 15:14:58.000000000 +0200 
    77 @@ -204,7 +204,6 @@ 
     34--- a/src/cardif/linux/cardif_linux_wext.c 
     35+++ b/src/cardif/linux/cardif_linux_wext.c 
     36@@ -203,7 +203,6 @@ 
     37 #include <netinet/in.h> 
    7838 #include <linux/types.h> 
    7939 #include <linux/socket.h> 
    80  #include <linux/if.h> 
    8140-#include <linux/wireless.h> 
    8241 #include <iwlib.h> 
    8342 #include <linux/if_packet.h> 
    8443 #include <linux/netlink.h> 
     44--- a/configure 
     45+++ b/configure 
     46@@ -4759,7 +4759,6 @@ cat >>conftest.$ac_ext <<_ACEOF 
     47    #ifndef __user 
     48    #define __user 
     49    #endif 
     50-   #include <linux/wireless.h> 
     51  
     52 #include <$ac_header> 
     53 _ACEOF 
     54@@ -4823,7 +4822,6 @@ cat >>conftest.$ac_ext <<_ACEOF 
     55                   #ifndef __user 
     56                   #define __user 
     57                   #endif 
     58-                   #include <linux/wireless.h> 
     59                    #include <iwlib.h> 
     60 int 
     61 main () 
Note: See TracChangeset for help on using the changeset viewer.