Skip to contentSkip to conversation

iw: bump to version 3.10

PATCH New Gustavo Zacarias 2 participants 3 messages May 2, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iw: bump to version 3.10

---
 package/iw/iw.mk | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
package/iw/iw.mk +3 -9
index 54c42d7..6d7ab16 100644
@@ -4,28 +4,22 @@
 #
 #############################################################
 
-IW_VERSION = 3.8
+IW_VERSION = 3.10
 IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw
 IW_LICENSE = iw license
 IW_LICENSE_FILES = COPYING
 IW_DEPENDENCIES = host-pkgconf libnl
-IW_CONFIG = $(IW_DIR)/.config
+IW_MAKE_OPT = CC=$(TARGET_CC) LD=$(TARGET_LD) LDFLAGS=$(TARGET_LDFLAGS)
 IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 	GIT_DIR=$(IW_DIR)
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 # libnl needs pthread/m, so we need to explicitly with them when static
 # these need to added AFTER libnl, so we have to override LIBS completely
-IW_MAKE_OPT = LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
+IW_MAKE_OPT += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
 endif
 
-define IW_CONFIGURE_CMDS
-	echo "CC = $(TARGET_CC)" >$(IW_CONFIG)
-	echo "CFLAGS = $(TARGET_CFLAGS)" >>$(IW_CONFIG)
-	echo "LDFLAGS = $(TARGET_LDFLAGS)" >>$(IW_CONFIG)
-endef
-
 define IW_BUILD_CMDS
 	$(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPT) -C $(@D)
 endef
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/1 iw: bump to version 3.10

Dear Gustavo Zacarias,

Quoted 1 line · Gustavo Zacarias

+IW_MAKE_OPT = CC=$(TARGET_CC) LD=$(TARGET_LD) LDFLAGS=$(TARGET_LDFLAGS)

Missing quotes, will break when ccache is enabled. You should probably be using $(TARGET_CONFIGURE_OPTS) instead.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 iw: bump to version 3.10

Quoted 4 lines · Thomas Petazzoni
Quoted 1 line

+IW_MAKE_OPT = CC=$(TARGET_CC) LD=$(TARGET_LD) LDFLAGS=$(TARGET_LDFLAGS)

Missing quotes, will break when ccache is enabled. You should probably be using $(TARGET_CONFIGURE_OPTS) instead.

Aich!
TARGET_CONFIGURE_OPTS doesn't work, it breaks in this case. Regards.