[OE-core] [PATCH 2/2] wireless-tools: Upgrade 29 -> 30.pre9

[Khem Raj]

On Sunday, February 02, 2014 10:02:33 AM Richard Purdie wrote:
> On Sat, 2014-02-01 at 01:00 -0800, Khem Raj wrote:
> > 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 at gmail.com>
> > ---
> >  .../wireless-tools/wireless-tools/man.patch        | 24 ++++++++++----------
> >  ...eless-tools_29.bb => wireless-tools_30.pre9.bb} | 26 +++++++++++-----------
> >  2 files changed, 25 insertions(+), 25 deletions(-)
> >  rename meta/recipes-connectivity/wireless-tools/{wireless-tools_29.bb => wireless-tools_30.pre9.bb} (79%)
> > 
> > diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
> > index 8e16215..6a757da 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
> > similarity index 79%
> > rename from meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
> > rename to meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
> > index 3aef24e..bae22a0 100644
> > --- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
> > +++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
> > @@ -6,20 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> >  			file://iwevent.c;beginline=59;endline=72;md5=d66a10026d4394f0a5b1c5587bce4537 \
> >  			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' \
> > @@ -29,7 +28,8 @@ EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
> >  		'INSTALL_MAN=${D}${mandir}'"
> >  
> >  do_compile() {
> > -	oe_runmake all libiw.a
> > +	oe_runmake libiw.a
> > +	oe_runmake all
> >  }
> 
> Why the change to do_compile?
> 

I tested by removing above hunk and it worked all fine.
additionally I removed PE accidentally which I put back again. The reworked patch is push on to the pull branch.

> Cheers,
> 
> Richard
> 
> 

-- 
-Khem
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20140202/b4ff3441/attachment-0002.sig>