Dylan backport from master
cover Dylan backport from master
The following change since commit 1aeab422006c5e5b1bffa3fa05669fcb01d7ffdf:
guile: fix the depends for target recipes (2014-02-09 10:05:08 +0000)
is available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/dylan-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dylan-next
Chen Qi (1):
subversion: fix build problem when sysroot contains '-D' or '-I'
.../neon.m4-fix-includes-and-cflags.patch | 32 ++++++++++++++++++++++ .../subversion/subversion_1.7.8.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.8/neon.m4-fix-includes-and-cflags.patch
Signature · 1 line
1.8.5.3
PATCH 1/1 subversion: fix build problem when sysroot contains '-D' or '-I'
From: Chen Qi <[email protected]>
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)
--- .../neon.m4-fix-includes-and-cflags.patch | 32 ++++++++++++++++++++++ .../subversion/subversion_1.7.8.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.8/neon.m4-fix-includes-and-cflags.patch
meta/recipes-devtools/subversion/subversion-1.7.8/neon.m4-fix-includes-and-cflags.patch new file +32 -0
@@ -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 <[email protected]> + +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"
meta/recipes-devtools/subversion/subversion_1.7.8.bb +1 -0
@@ -12,6 +12,7 @@ inherit gettext SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://libtool2.patch \ file://fix-install-depends.patch \ + file://neon.m4-fix-includes-and-cflags.patch \ " SRC_URI[md5sum] = "454b9f398415c3504435bf8c3f6ed127" SRC_URI[sha256sum] = "fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686"
Signature · 1 line
1.8.5.3