* [PATCH 0/1] subversion: fix build problem when sysroot contains '-D' or '-I' @ 2013-11-16 3:19 Qi.Chen 2013-11-16 3:19 ` [PATCH 1/1] " Qi.Chen 2013-11-25 3:15 ` [PATCH 0/1] " ChenQi 0 siblings, 2 replies; 4+ messages in thread From: Qi.Chen @ 2013-11-16 3:19 UTC (permalink / raw) To: openembedded-core From: Chen Qi <Qi.Chen@windriver.com> The following changes since commit ea92671d9823e3667d6ced7ac2af20f991da404d: bitbake: cooker: replace "w" file opening mode with "a" mode (2013-11-12 17:01:37 +0000) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/subversion-D-I http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/subversion-D-I 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.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 -- 1.7.9.5 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] subversion: fix build problem when sysroot contains '-D' or '-I' 2013-11-16 3:19 [PATCH 0/1] subversion: fix build problem when sysroot contains '-D' or '-I' Qi.Chen @ 2013-11-16 3:19 ` Qi.Chen 2014-01-31 12:08 ` Nicolas Dechesne 2013-11-25 3:15 ` [PATCH 0/1] " ChenQi 1 sibling, 1 reply; 4+ messages in thread From: Qi.Chen @ 2013-11-16 3:19 UTC (permalink / raw) To: openembedded-core From: Chen Qi <Qi.Chen@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.Chen@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 0000000..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.Chen@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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] subversion: fix build problem when sysroot contains '-D' or '-I' 2013-11-16 3:19 ` [PATCH 1/1] " Qi.Chen @ 2014-01-31 12:08 ` Nicolas Dechesne 0 siblings, 0 replies; 4+ messages in thread From: Nicolas Dechesne @ 2014-01-31 12:08 UTC (permalink / raw) To: Qi.Chen, liezhi.yang; +Cc: Patches and discussions about the oe-core layer 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.dechesne@linaro.org> thanks nicolas On Sat, Nov 16, 2013 at 4:19 AM, <Qi.Chen@windriver.com> wrote: > From: Chen Qi <Qi.Chen@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.Chen@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 0000000..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.Chen@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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] subversion: fix build problem when sysroot contains '-D' or '-I' 2013-11-16 3:19 [PATCH 0/1] subversion: fix build problem when sysroot contains '-D' or '-I' Qi.Chen 2013-11-16 3:19 ` [PATCH 1/1] " Qi.Chen @ 2013-11-25 3:15 ` ChenQi 1 sibling, 0 replies; 4+ messages in thread From: ChenQi @ 2013-11-25 3:15 UTC (permalink / raw) To: openembedded-core ping On 11/16/2013 11:19 AM, Qi.Chen@windriver.com wrote: > From: Chen Qi <Qi.Chen@windriver.com> > > The following changes since commit ea92671d9823e3667d6ced7ac2af20f991da404d: > > bitbake: cooker: replace "w" file opening mode with "a" mode (2013-11-12 17:01:37 +0000) > > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib ChenQi/subversion-D-I > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/subversion-D-I > > 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.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 > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-31 12:09 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-16 3:19 [PATCH 0/1] subversion: fix build problem when sysroot contains '-D' or '-I' Qi.Chen 2013-11-16 3:19 ` [PATCH 1/1] " Qi.Chen 2014-01-31 12:08 ` Nicolas Dechesne 2013-11-25 3:15 ` [PATCH 0/1] " ChenQi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox