summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-11-16 03:19:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-09 11:04:13 +0000
commit1ed91fcd033be8c2b301aeb119f338cfa5e8dda2 (patch)
tree6c010f51a0d4bd0ff6835740574c02bbd21f2f7f /meta
parent2ab41dfb60a6c82bd99112ec616ed98f2a91d70c (diff)
downloadpoky-1ed91fcd033be8c2b301aeb119f338cfa5e8dda2.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 master rev: 7078397ef39de43244fca7e24683b2a83913cbbf) (From OE-Core rev: 6a0187d6ce57552c9f00f74dc9001ce0400f0608) 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> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch32
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.7.10.bb1
2 files changed, 33 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"
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.10.bb b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
index 4acd70b8cd..489bddfc61 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.10.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
@@ -13,6 +13,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
13 file://libtool2.patch \ 13 file://libtool2.patch \
14 file://fix-install-depends.patch \ 14 file://fix-install-depends.patch \
15 file://allow-updated-neon.patch \ 15 file://allow-updated-neon.patch \
16 file://neon.m4-fix-includes-and-cflags.patch \
16" 17"
17SRC_URI[md5sum] = "4088a77e14232876c9b4ff1541e6e200" 18SRC_URI[md5sum] = "4088a77e14232876c9b4ff1541e6e200"
18SRC_URI[sha256sum] = "c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7" 19SRC_URI[sha256sum] = "c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7"