From 890fa3d0e71f951993252f5b94e2211b4b06670e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Sep 2015 08:25:19 +0000 Subject: alsa-tools: Fix compiling with clang Fixed a linking error occurring when building with clang, where a function reference is emitted but function is not since its marked as inline, making it static inline gives better opportunity to compiler to compile it Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- ...s10k1-Make-output_tram_line-static-inline.patch | 31 ++++++++++++++++++++++ meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch b/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch new file mode 100644 index 0000000000..d049a30d2c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch @@ -0,0 +1,31 @@ +From 1e5926df74a35fe2cd90bc59f5264a8715c94048 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 7 Sep 2015 08:16:59 +0000 +Subject: [PATCH] as10k1: Make output_tram_line() static inline + +The function is not used in any other file, its better to make it static +inline so compiler has a better chance of optimizing here + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + as10k1/as10k1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/as10k1/as10k1.c b/as10k1/as10k1.c +index 96af0c3..d0766fd 100644 +--- a/as10k1/as10k1.c ++++ b/as10k1/as10k1.c +@@ -366,7 +366,7 @@ void as_exit(const char *message) + exit(1); + } + +-inline void output_tram_line( struct list_head *line_head, int type){ ++static inline void output_tram_line( struct list_head *line_head, int type){ + + struct tram *tram_sym; + struct list_head *entry; +-- +2.5.1 + diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb index b5b9cc49c8..fdf396e3f3 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb @@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ 'file://makefile_no_gtk.patch', d)} \ file://gitcompile_hdajacksensetest \ + file://0001-as10k1-Make-output_tram_line-static-inline.patch \ " SRC_URI[md5sum] = "f339a3cd24f748c9d007bdff0e98775b" -- cgit 1.2.3-korg