Fix alsa-lib compiles fails on mips
cover Fix alsa-lib compiles fails on mips
The following changes since commit b2ff1add530b1fec2fb7f385227a03db47015c37:
poky.conf: Don't force the addition of extra DISTRO_FEATURES (2013-08-20 22:58:04 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/alsa-lib
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/alsa-lib
Kai Kang (1):
alsa-lib: fix function definitions error for mips
...-iatomic.h-functions-definitions-for-mips.patch | 68 ++++++++++++++++++++++ meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb | 1 + 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch
Signature · 1 line
1.8.1.2
PATCH 1/1 alsa-lib: fix function definitions error for mips
Functions atomic_add(s) and atomic_sub(s) are defined with 'extern __inline__' that may cause compile fails when cross compile for mips. The error message looks like:
| pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope':
| .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub'
Replace the 'extern __inline__' with 'static __inline__' to fix this issue.
--- ...-iatomic.h-functions-definitions-for-mips.patch | 68 ++++++++++++++++++++++ meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb | 1 + 2 files changed, 69 insertions(+) create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch
meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch new file +68 -0
@@ -0,0 +1,68 @@ +Upstream-Status: Backport + +Signed-off-by: Kai Kang <[email protected]> + +From f21f48a70f8437a671b58fcab75e54222a9eea16 Mon Sep 17 00:00:00 2001 +From: Kai Kang <jiashuo.kang at gmail.com> +Date: Thu, 15 Aug 2013 17:17:19 +0800 +Subject: [PATCH] Update iatomic.h functions definitions for mips + +Functions atomic_add(s) and atomic_sub(s) are defined with 'extern +__inline__' that may cause compile fails when cross compile for mips. +The error message looks like: + +| pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope': +| .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub' + +Replace the 'extern __inline__' with 'static __inline__' to fix this +issue. + +Signed-off-by: Kai Kang <jiashuo.kang at gmail.com> +Signed-off-by: Takashi Iwai <[email protected]> +--- + include/iatomic.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/iatomic.h b/include/iatomic.h +index 5711fe8..2393297 100644 +--- a/include/iatomic.h ++++ b/include/iatomic.h +@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t; + * Atomically adds @i to @v. Note that the guaranteed useful range + * of an atomic_t is only 24 bits. + */ +-extern __inline__ void atomic_add(int i, atomic_t * v) ++static __inline__ void atomic_add(int i, atomic_t * v) + { + unsigned long temp; + +@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v) + * Atomically subtracts @i from @v. Note that the guaranteed + * useful range of an atomic_t is only 24 bits. + */ +-extern __inline__ void atomic_sub(int i, atomic_t * v) ++static __inline__ void atomic_sub(int i, atomic_t * v) + { + unsigned long temp; + +@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v) + /* + * Same as above, but return the result value + */ +-extern __inline__ int atomic_add_return(int i, atomic_t * v) ++static __inline__ int atomic_add_return(int i, atomic_t * v) + { + unsigned long temp, result; + +@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v) + return result; + } + +-extern __inline__ int atomic_sub_return(int i, atomic_t * v) ++static __inline__ int atomic_sub_return(int i, atomic_t * v) + { + unsigned long temp, result; + +-- +1.8.1.2 +
meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb +1 -0
@@ -17,6 +17,7 @@ ARM_INSTRUCTION_SET = "arm" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ file://Check-if-wordexp-function-is-supported.patch \ file://fix-tstamp-declaration.patch \ + file://Update-iatomic.h-functions-definitions-for-mips.patch \ " SRC_URI[md5sum] = "69129a7c37697f81ac092335e9fa452b" SRC_URI[sha256sum] = "690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19"
Signature · 1 line
1.8.1.2