# HG changeset patch # User Christophe Lincoln # Date 1394569525 -3600 # Node ID e1174b47e40eaba19ebb3d8ea29c7f8d08d2bf42 # Parent 9c889f88b9fdfbb94820472f15665a4265580502 wpa_supplicant: fix 2.1 cross compilation for ARM diff -r 9c889f88b9fd -r e1174b47e40e wpa_supplicant/receipt --- a/wpa_supplicant/receipt Tue Mar 11 15:44:47 2014 +0000 +++ b/wpa_supplicant/receipt Tue Mar 11 21:25:25 2014 +0100 @@ -13,23 +13,17 @@ TAGS="wireless wifi network" HOST_ARCH="i486 arm" -DEPENDS="libssl libcrypto libnl" +DEPENDS="libssl libcrypto libnl dbus" BUILD_DEPENDS="openssl-dev libcrypto-dev libnl-dev dbus-dev" +# Arch install +case "$SLITAZ_ARCH" in + arm*) DEPENDS="libssl libcrypto libnl" ;; +esac + # Cross compile case "$ARCH" in - arm*) - VERSION="0.7.3" - BUILD_DEPENDS="openssl-dev libcrypto-dev" - TARBALL="$PACKAGE-$VERSION.tar.gz" - WGET_URL="http://hostap.epitest.fi/releases/$TARBALL" ;; -esac - -# Arch install -case "$SLITAZ_ARCH" in - arm*) - VERSION="0.7.3" - DEPENDS="libssl libcrypto" ;; + arm*) BUILD_DEPENDS="openssl-dev libcrypto-dev libnl-dev" ;; esac # Rules to configure and make the package. @@ -37,24 +31,31 @@ { cd $src/$PACKAGE cp -a ./defconfig ./.config - case "$ARCH" in - i?86) - sed 's/-lnl/-lnl-3/g' -i ../src/drivers/drivers.mak - sed 's/-lnl-3-genl/-lnl-genl-3/g' -i ../src/drivers/drivers.mak - cat >> .config << EOF + sed 's/-lnl/-lnl-3/g' -i ../src/drivers/drivers.mak + sed 's/-lnl-3-genl/-lnl-genl-3/g' -i ../src/drivers/drivers.mak + # Main build configs + cat >> .config << EOT CONFIG_AP=y CONFIG_BGSCAN_SIMPLE=y CONFIG_LIBNL20=y +EOT + # Dont use DBUS on ARM arch + case "$ARCH" in + i?86) + cat >> .config << EOT CFLAGS += -I/usr/include/libnl3 CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y -EOF +EOT ;; arm) - # 2.X dont cross compile for ARM - #echo 'CFLAGS += -I${sysroot}/usr/include/libnl3' >> .config - continue ;; + cat >> .config << EOT +CFLAGS += -I${sysroot}/usr/include/libnl3 +CFLAGS += -I${sysroot}/usr/include/openssl +LIBS += -L${sysroot}/usr/lib +EOT + ;; esac make BINDIR=/usr/bin LIBDIR=/lib }