From: Stijn Tintel Date: Sat, 30 Sep 2017 00:35:50 +0000 (+0300) Subject: hostapd: escape double quoutes in wpad CFLAGS X-Git-Tag: v18.06.0-rc1~2096 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c0882035353238b061369fcff4bb1e248409e71a;p=openwrt%2Fstaging%2Fxback.git hostapd: escape double quoutes in wpad CFLAGS A recent commit in hostapd added a build option to specify the default TLS ciphers. This build option is passed via CFLAGS. Due to the way CFLAGS are handled when building wpad, the compiler tries to recursively expand TLS_DEFAULT_CIPHERS, resulting in the following error: ../src/crypto/tls_openssl.c: In function 'tls_init': :0:21: error: 'DEFAULT' undeclared (first use in this function) ../src/crypto/tls_openssl.c:1028:13: note: in expansion of macro 'TLS_DEFAULT_CIPHERS' ciphers = TLS_DEFAULT_CIPHERS; ^ Escape double quotes in the .cflags file to avoid this. Fixes: 2f78034c3ef ("hostapd: update to version 2017-08-24") Signed-off-by: Stijn Tintel --- diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 2558f2da0b..344896ca62 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -299,6 +299,7 @@ define Build/Compile/wpad $(call Build/RunMake,wpa_supplicant,-s MULTICALL=1 dump_cflags) | \ sed -e 's,-n ,,g' -e 's^$(TARGET_CFLAGS)^^' \ ` > $(PKG_BUILD_DIR)/.cflags + sed -i 's/"/\\"/g' $(PKG_BUILD_DIR)/.cflags +$(call Build/RunMake,hostapd, \ CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \ MULTICALL=1 \