lame: always link with libm (from OE)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3008 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 25 insertions, 2 deletions

diff --git a/meta/packages/lame/lame/Makefile-lm.patch b/meta/packages/lame/lame/Makefile-lm.patch
new file mode 100644
index 0000000000..cbbb1706ce
--- /dev/null
+++ b/meta/packages/lame/lame/Makefile-lm.patch
@@ -0,0 +1,22 @@
+--- lame-3.96.1/libmp3lame/Makefile.am.old      2007-01-16 13:41:48.000000000 +0000
++++ lame-3.96.1/libmp3lame/Makefile.am  2007-01-16 13:41:53.000000000 +0000
+@@ -18,7 +18,7 @@
+ decoder_ldadd =
+ endif
+ 
+-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
+ libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
+                        -no-undefined
+ 
+--- lame-3.96.1/libmp3lame/Makefile.in.old      2007-01-16 13:47:17.000000000 +0000
++++ lame-3.96.1/libmp3lame/Makefile.in  2007-01-16 13:47:29.000000000 +0000
+@@ -177,7 +177,7 @@
+ @LIB_WITH_DECODER_TRUE@decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
+ @LIB_WITH_DECODER_FALSE@decoder_ldadd = 
+ 
+-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
+ libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
+                        -no-undefined
+ 
diff --git a/meta/packages/lame/lame_3.96.1.bb b/meta/packages/lame/lame_3.96.1.bb
index edb4265f13..0c5c245829 100644
--- a/meta/packages/lame/lame_3.96.1.bb
+++ b/meta/packages/lame/lame_3.96.1.bb
@@ -1,10 +1,11 @@
 SECTION = "console/utils"
 DESCRIPTION = "Not an MP3 encoder"
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
-        file://no-gtk1.patch;patch=1"
+        file://no-gtk1.patch;patch=1 \
+        file://Makefile-lm.patch;patch=1"
 
 inherit autotools