Changeset 20547


Ignore:
Timestamp:
2010-03-28T19:09:52+02:00 (8 years ago)
Author:
nbd
Message:

hostapd: clean up openssl tls dependencies and build handling (fixes #6572)

Location:
trunk/package/hostapd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/hostapd/Config.in

    r19286 r20547  
    1111        prompt "Choose TLS provider" 
    1212        default WPA_SUPPLICANT_INTERNAL 
    13         depends PACKAGE_wpa-supplicant 
     13        depends PACKAGE_wpa-supplicant || PACKAGE_wpad 
    1414 
    1515config WPA_SUPPLICANT_INTERNAL 
  • trunk/package/hostapd/Makefile

    r20396 r20547  
    5858        CONFIG_IEEE80211W=$(CONFIG_PACKAGE_kmod-ath9k) 
    5959 
    60 ifeq ($(LOCAL_TYPE),supplicant) 
    61   ifeq ($(LOCAL_VARIANT),full) 
    62     DRIVER_MAKEOPTS += $(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),CONFIG_TLS=openssl) 
     60ifneq ($(LOCAL_TYPE),hostapd) 
     61  ifdef CONFIG_WPA_SUPPLICANT_OPENSSL 
     62    ifeq ($(LOCAL_VARIANT),full) 
     63      DRIVER_MAKEOPTS += CONFIG_TLS=openssl 
     64      TARGET_LDFLAGS += -lcrypto -lssl 
     65    endif 
    6366  endif 
    64 endif 
    65  
    66 ifneq ($(LOCAL_TYPE),hostapd) 
    6767  ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK 
    6868    TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK 
     
    7272endif 
    7373 
     74DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN) 
     75 
    7476define Package/hostapd/Default 
    7577  SECTION:=net 
     
    7779  TITLE:=IEEE 802.1x Authenticator 
    7880  URL:=http://hostap.epitest.fi/ 
    79   DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN) 
     81  DEPENDS:=$(DRV_DEPENDS) 
    8082  MAINTAINER:=Felix Fietkau <nbd@openwrt.org> 
    8183endef 
     
    118120  TITLE:=IEEE 802.1x Authenticator/Supplicant 
    119121  URL:=http://hostap.epitest.fi/ 
    120   DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN) 
    121122  MAINTAINER:=Felix Fietkau <nbd@openwrt.org> 
    122123endef 
     
    125126$(call Package/wpad/Default) 
    126127  TITLE+= (full) 
     128  DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl 
    127129  VARIANT:=wpad-full 
    128130endef 
     
    136138$(call Package/wpad/Default) 
    137139  TITLE+= (WPA-PSK only) 
     140  DEPENDS:=$(DRV_DEPENDS) 
    138141  VARIANT:=wpad-mini 
    139142endef 
     
    148151  TITLE:=WPA Supplicant 
    149152  URL:=http://hostap.epitest.fi/wpa_supplicant/ 
    150   DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN) 
     153  DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl 
    151154  VARIANT:=supplicant-full 
    152155  MAINTAINER:=Felix Fietkau <nbd@openwrt.org> 
     
    164167  $(Package/wpa-supplicant) 
    165168  TITLE:=WPA Supplicant (minimal version) 
    166   DEPENDS:=$(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),+libopenssl) 
     169  DEPENDS:=$(DRV_DEPENDS) 
    167170  VARIANT:=supplicant-mini 
    168171endef 
Note: See TracChangeset for help on using the changeset viewer.