[oe-commits] org.oe.dev alsa-lib: fix avr32 builds and libmath detection

[woglinde2 commit]

alsa-lib: fix avr32 builds and libmath detection
* fix bug 4364 provided Geoffrey Wossum
* add fix_libmath.patch to correct detection either -lm is needed or not
* bump PR

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: be3713b5fac2aae7f226418a48c1d67f2f902170
ViewMTN: http://monotone.openembedded.org/revision/info/be3713b5fac2aae7f226418a48c1d67f2f902170
Files:
1
packages/alsa/alsa-lib/fix_libmath.patch
packages/alsa/alsa-versym.inc
packages/alsa/alsa-lib_1.0.15.bb
Diffs:

#
# mt diff -r0cfa04cdbd5083beedc4ac03b13fcd52c5f2960c -rbe3713b5fac2aae7f226418a48c1d67f2f902170
#
#
#
# add_file "packages/alsa/alsa-lib/fix_libmath.patch"
#  content [55db68aef57ed41890c8977335a2793c5f1b491b]
# 
# add_file "packages/alsa/alsa-versym.inc"
#  content [957d390b9f2272ea29b2cb24f7e33f8ca8843d15]
# 
# patch "packages/alsa/alsa-lib_1.0.15.bb"
#  from [2e5d3f16e83a9a0cb85abacde76247c41534ae70]
#    to [60c8a8b8e5ce8fd414421ff9168d97354fbfa467]
#
============================================================
--- packages/alsa/alsa-lib/fix_libmath.patch	55db68aef57ed41890c8977335a2793c5f1b491b
+++ packages/alsa/alsa-lib/fix_libmath.patch	55db68aef57ed41890c8977335a2793c5f1b491b
@@ -0,0 +1,17 @@
+Index: alsa-lib-1.0.15/configure.in
+===================================================================
+--- alsa-lib-1.0.15.orig/configure.in	2007-10-15 10:45:26.000000000 +0200
++++ alsa-lib-1.0.15/configure.in	2008-07-19 15:51:34.177119589 +0200
+@@ -191,9 +191,9 @@
+   AC_MSG_RESULT(no)
+ fi
+ 
+-ALSA_DEPLIBS=""
+-if test "$softfloat" != "yes"; then
+-  ALSA_DEPLIBS="-lm"
++ALSA_DEPLIBS="-lm"
++if test "$softfloat" = "yes"; then
++   AC_CHECK_LIB([m], [floor], , [ALSA_DEPLIBS=""])
+ fi
+ 
+ dnl Check for libdl
============================================================
--- packages/alsa/alsa-versym.inc	957d390b9f2272ea29b2cb24f7e33f8ca8843d15
+++ packages/alsa/alsa-versym.inc	957d390b9f2272ea29b2cb24f7e33f8ca8843d15
@@ -0,0 +1,21 @@
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
============================================================
--- packages/alsa/alsa-lib_1.0.15.bb	2e5d3f16e83a9a0cb85abacde76247c41534ae70
+++ packages/alsa/alsa-lib_1.0.15.bb	60c8a8b8e5ce8fd414421ff9168d97354fbfa467
@@ -2,6 +2,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
+PR = "1"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -10,15 +11,24 @@ SRC_URI = "ftp://ftp.alsa-project.org/pu
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1"
+           file://fix-tstamp-declaration.patch;patch=1 \
+	   file://fix_libmath.patch;patch=1 \
+	  "
 
 inherit autotools pkgconfig
 
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+
+
 require alsa-fpu.inc
 EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
 
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
 
+require alsa-versym.inc
+EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
+
+
 do_stage () {
 	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
 	install -d ${STAGING_INCDIR}/alsa/sound