From 08798024fd093d15a1e1f7f22bc14adf263275d3 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Sat, 19 Jul 2008 13:56:52 +0000
Subject: 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
---
packages/alsa/alsa-lib/fix_libmath.patch | 17 +++++++++++++++++
packages/alsa/alsa-lib_1.0.15.bb | 14 ++++++++++++--
packages/alsa/alsa-versym.inc | 21 +++++++++++++++++++++
3 files changed, 50 insertions(+), 2 deletions(-)
create mode 100644 packages/alsa/alsa-lib/fix_libmath.patch
create mode 100644 packages/alsa/alsa-versym.inc
(limited to 'packages/alsa')
diff --git a/packages/alsa/alsa-lib/fix_libmath.patch b/packages/alsa/alsa-lib/fix_libmath.patch
new file mode 100644
index 0000000000..23309ce381
--- /dev/null
+++ b/packages/alsa/alsa-lib/fix_libmath.patch
@@ -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
diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb
index 60b44dbc8e..399352f299 100644
--- a/packages/alsa/alsa-lib_1.0.15.bb
+++ b/packages/alsa/alsa-lib_1.0.15.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Alsa sound library"
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,14 +11,23 @@ LICENSE = "GPL"
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}/
diff --git a/packages/alsa/alsa-versym.inc b/packages/alsa/alsa-versym.inc
new file mode 100644
index 0000000000..6d585ecf4a
--- /dev/null
+++ b/packages/alsa/alsa-versym.inc
@@ -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 ""
+
--
cgit v1.2.3