summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-11-16 03:19:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 17:45:53 +0000
commit3c94bfe8c57a3a9a1fefd5a36c64fb6071175e48 (patch)
tree62e39578ea784ceab56abd69c05ee002dce2ae7b /meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
parent6cdecac4ef4b43917935aa0f5fb80548237ea92b (diff)
downloadpoky-3c94bfe8c57a3a9a1fefd5a36c64fb6071175e48.tar.gz
subversion: fix build problem when sysroot contains '-D' or '-I'
If sysroot contains '-D' or '-I' characters, the SVN_NEON_INCLUDES and the corresponding CFLAGS will not get the correct value. This will cause build failures. This patch fixes the above problem. [YOCTO #5458] (From OE-Core rev: 7078397ef39de43244fca7e24683b2a83913cbbf) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch')
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
new file mode 100644
index 0000000000..013d0c3649
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
@@ -0,0 +1,32 @@
1Fix to get correct SVN_NEON_CONFIG and CFLAGS when sysroot path contains '-D' and '-I'
2characters.
3
4Upstream-Status: Pending
5
6Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
7
8index f951039..a813145 100644
9--- a/build/ac-macros/neon.m4
10+++ b/build/ac-macros/neon.m4
11@@ -105,8 +105,8 @@ AC_DEFUN(SVN_NEON_CONFIG,
12 test "$svn_allowed_neon" = "any"; then
13 svn_allowed_neon_on_system="yes"
14 if test "$NEON_PKG_CONFIG" = "yes"; then
15- SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | $SED -e 's/-D[^ ]*//g'`]
16- CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^ ]*//g'`"]
17+ SVN_NEON_INCLUDES=["`$PKG_CONFIG neon --cflags | $SED -e 's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`"]
18+ CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`"]
19 old_CFLAGS="$CFLAGS"
20 old_LIBS="$LIBS"
21 NEON_LIBS=`$PKG_CONFIG neon --libs`
22@@ -126,8 +126,8 @@ int main()
23 CFLAGS="$old_CFLAGS"
24 LIBS="$old_LIBS"
25 else
26- SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`]
27- CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"]
28+ SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`]
29+ CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`"]
30 NEON_LIBS=`$neon_config --libs`
31 fi
32 svn_lib_neon="yes"