Mercurial > vanilla

changeset 1037:c407c89fa383

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
network/wpa-supplicant: allow SSL=yes for default implementation
author David Demelier <markand@malikania.fr>
date Fri, 30 Aug 2019 18:12:35 +0200
parents 97cbce8be985
children ff9f0c0f36bd
files network/wpa-supplicant/wpa-supplicant.sh
diffstat 1 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/network/wpa-supplicant/wpa-supplicant.sh	Fri Aug 30 18:12:19 2019 +0200
+++ b/network/wpa-supplicant/wpa-supplicant.sh	Fri Aug 30 18:12:35 2019 +0200
@@ -24,22 +24,25 @@
 PKGDEPENDS="bison:build libnl"
 PKGOPTIONS="DBUS SSL"
 
-# TODO: honor CFLAGS
 : ${CC:=clang}
+: ${CFLAGS:=-O2}
 : ${DBUS:=yes}
-: ${SSL:=openssl}
+: ${SSL:=libressl}      # Note: can be libressl (or yes) or gnutls.
 
 if [ "$DBUS" = "yes" ]; then
 	PKGDEPENDS="$PKGDEPENDS dbus"
 fi
 
-if [ "$SSL" = "openssl" ]; then
-	PKGDEPENDS="$PKGDEPENDS libressl"
-elif [ "$SSL" = "gnutls" ]; then
-	PKGDEPENDS="$PKGDEPENDS gnutls"
-else
-	with_crypto="no"
-fi
+case $SSL in
+"yes"|"libressl")
+	PKGDEPENDS="libressl $PKGDEPENDS"
+	with_ssl="openssl"
+	;;
+"gnutls")
+	PKGDEPENDS="gnutls $PKGDEPENDS"
+	with_ssl="gnutls"
+	;;
+esac
 
 build()
 {
@@ -53,12 +56,15 @@
 		sed -i -e '/CONFIG_CTRL_IFACE_DBUS_NEW.*/d' .config
 		sed -i -e '/CONFIG_CTRL_IFACE_DBUS_INTRO.*/d' .config
 	fi
-	if [ "$with_crypto" != "no" ]; then
-		sed -i -e "s/^#CONFIG_TLS.*/CONFIG_TLS=$SSL/" .config
+
+	if [ -n "$with_ssl" ]; then
+		sed -i -e "s/^#CONFIG_TLS.*/CONFIG_TLS=$with_ssl/" .config
 	fi
 
 	make \
+		V=1 \
 		CC="$CC" \
+		EXTRA_CFLAGS="$CFLAGS" \
 		BINDIR=/bin \
 		LIBDIR=/lib \
 		DESTDIR=$DESTDIR \