]> code.ossystems Code Review - meta-freescale.git/blob
4f69c784f5fd92f846b25e0eed1d7393642e1f6d
[meta-freescale.git] /
1 From: Javier Viguera <javier.viguera@digi.com>
2 Date: Mon, 2 Nov 2015 17:52:48 +0100
3 Subject: [PATCH] gst1.0-fsl-plugins: fix appending data to variable
4
5 FSL_MM_CORE_CFLAGS and FSL_MM_CORE_LIBS where concatenating data at the
6 end without adding a blank space between additions.
7
8 As the appended data was a result of `pkg-config` expansion, this was
9 working correctly until pkg-config v0.28 because it was pkg-config who
10 was adding the trailing space.
11
12 But after pkg-config v0.28, specifically in this commit:
13
14 http://cgit.freedesktop.org/pkg-config/commit/?id=f26a505826acec6b1e1af8d1efdf959913421c3a
15
16 this is no longer true, so the configure script needs to add that space.
17
18 Signed-off-by: Javier Viguera <javier.viguera@digi.com>
19 ---
20  configure.ac | 10 +++++-----
21  1 file changed, 5 insertions(+), 5 deletions(-)
22
23 diff --git a/configure.ac b/configure.ac
24 index 4da48867fafd..01bff6ca5348 100755
25 --- a/configure.ac
26 +++ b/configure.ac
27 @@ -203,14 +203,14 @@ AC_SUBST(RT_CFLAGS)
28  AC_SUBST(RT_LIBS)
29  
30  FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
31 -FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`
32 -FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null`
33 -FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`
34 +FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`"
35 +FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslparser 2>/dev/null`"
36 +FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`"
37  AC_SUBST(FSL_MM_CORE_CFLAGS)
38  
39  FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null`
40 -FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`
41 -FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null`
42 +FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`"
43 +FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslparser 2>/dev/null`"
44  AC_SUBST(FSL_MM_CORE_LIBS)
45  
46  EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_"