Robert,
can we get the patch below merged into dora? I just tried it, it
applies cleanly as-is. the thing is i stumbled upon this issue on dora
this week, and debugged it for a while to later figure out it was
fixed in master ;-)
fwiw, you can add
Signed-off-by: Nicolas Dechesne nicolas.deche...@linaro.org
thanks
nicolas
On Sat, Nov 16, 2013 at 4:19 AM, qi.c...@windriver.com wrote:
From: Chen Qi qi.c...@windriver.com
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]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
.../neon.m4-fix-includes-and-cflags.patch | 32
.../subversion/subversion_1.7.10.bb|1 +
2 files changed, 33 insertions(+)
create mode 100644
meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
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 000..013d0c3
--- /dev/null
+++
b/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch
@@ -0,0 +1,32 @@
+Fix to get correct SVN_NEON_CONFIG and CFLAGS when sysroot path contains
'-D' and '-I'
+characters.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi qi.c...@windriver.com
+
+index f951039..a813145 100644
+--- a/build/ac-macros/neon.m4
b/build/ac-macros/neon.m4
+@@ -105,8 +105,8 @@ AC_DEFUN(SVN_NEON_CONFIG,
+test $svn_allowed_neon = any; then
+ svn_allowed_neon_on_system=yes
+ if test $NEON_PKG_CONFIG = yes; then
+- SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | $SED -e
's/-D[^ ]*//g'`]
+- CFLAGS=[$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^
]*//g'`]
++ SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | $SED -e
's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`]
++ CFLAGS=[$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e
's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`]
+ old_CFLAGS=$CFLAGS
+ old_LIBS=$LIBS
+ NEON_LIBS=`$PKG_CONFIG neon --libs`
+@@ -126,8 +126,8 @@ int main()
+ CFLAGS=$old_CFLAGS
+ LIBS=$old_LIBS
+ else
+- SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/-D[^
]*//g'`]
+- CFLAGS=[$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^
]*//g'`]
++ SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/^-D[^
]*//g' -e 's/ -D[^ ]*//g'`]
++ CFLAGS=[$CFLAGS `$neon_config --cflags | $SED -e 's/^-I[^
]*//g' -e 's/ -I[^ ]*//g'`]
+ NEON_LIBS=`$neon_config --libs`
+ fi
+ 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 4acd70b..489bddf 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 \
file://libtool2.patch \
file://fix-install-depends.patch \
file://allow-updated-neon.patch \
+ file://neon.m4-fix-includes-and-cflags.patch \
SRC_URI[md5sum] = 4088a77e14232876c9b4ff1541e6e200
SRC_URI[sha256sum] =
c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
