aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-02-01 00:51:17 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 22:34:34 +0000
commite347b6b119f83a29802ae4499ddcb3ff6a23b317 (patch)
tree1a74d809372d5faa6fef893145c1c436cc7fe79c
parentb50bdeaea15fcd24fd2c03fd02d4a1a365948cef (diff)
downloadopenembedded-core-contrib-e347b6b119f83a29802ae4499ddcb3ff6a23b317.tar.gz
wireless-tools: Upgrade 29 -> 30.pre9
This also fixes the underlinking problems that are unearthed with newer binutils 2.24 where one of the wireless-tools libraries is asking for symbols from libm but all the symbols it asks for are unfortunately weak and they do not let new linker convince enough to link libm even though -lm is on cmdline since we are using --as-needed by default in linker, which means we end up with errors like | make: *** [iwconfig] Error 1 | libiw.so.30: undefined reference to `ceil' | libiw.so.30: undefined reference to `pow' | libiw.so.30: undefined reference to `log10' | libiw.so.30: undefined reference to `floor' | collect2: error: ld returned 1 exit status Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch24
-rw-r--r--meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb (renamed from meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb)22
2 files changed, 23 insertions, 23 deletions
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
index 8e16215ff6..6a757dae76 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
@@ -1,15 +1,15 @@
Upstream-Status: Inappropriate [configuration]
---- wireless_tools.26/Makefile.orig 2003-06-18 03:38:58.000000000 +0200
-+++ wireless_tools.26/Makefile 2004-07-03 23:35:29.000000000 +0200
-@@ -57,8 +57,8 @@
- # Install directories
- INSTALL_DIR= $(PREFIX)/sbin/
- INSTALL_LIB= $(PREFIX)/lib/
--INSTALL_INC= $(PREFIX)/include/
--INSTALL_MAN= $(PREFIX)/man/
-+INSTALL_INC= $(PREFIX)/usr/include/
-+INSTALL_MAN= $(PREFIX)/usr/share/man/
+Index: wireless_tools.30/Makefile
+===================================================================
+--- wireless_tools.30.orig/Makefile 2014-02-01 00:21:04.148463382 -0800
++++ wireless_tools.30/Makefile 2014-02-01 00:23:35.448072279 -0800
+@@ -76,7 +76,7 @@
+ INSTALL_DIR= $(PREFIX)/sbin
+ INSTALL_LIB= $(PREFIX)/lib
+ INSTALL_INC= $(PREFIX)/include
+-INSTALL_MAN= $(PREFIX)/man
++INSTALL_MAN= $(PREFIX)/share/man
- # Use local header if the version of wireless extensions is specified
- ifdef FORCE_WEXT_VERSION
+ # Various commands
+ RM = rm -f
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
index 3aef24ec4c..26ecdf3b40 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
@@ -7,19 +7,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
SECTION = "base"
PE = "1"
-PR = "r4"
-SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
- file://remove.ldconfig.call.patch \
- file://man.patch \
- file://wireless-tools.if-pre-up \
- file://zzz-wireless.if-pre-up \
- file://avoid_strip.patch \
- file://ldflags.patch"
+SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \
+ file://wireless-tools.if-pre-up \
+ file://zzz-wireless.if-pre-up \
+ file://remove.ldconfig.call.patch \
+ file://man.patch \
+ file://avoid_strip.patch \
+ file://ldflags.patch \
+ "
+SRC_URI[md5sum] = "ca91ba7c7eff9bfff6926b1a34a4697d"
+SRC_URI[sha256sum] = "abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63"
-SRC_URI[md5sum] = "e06c222e186f7cc013fd272d023710cb"
-SRC_URI[sha256sum] = "6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1"
-S = "${WORKDIR}/wireless_tools.29"
+S = "${WORKDIR}/wireless_tools.30"
CFLAGS =+ "-I${S}"
EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \