diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-11-16 03:19:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-17 15:10:52 +0000 |
commit | e2bb4a70a99a057d45316bbac65d6044ea54c484 (patch) | |
tree | cedbf0e5bcd6bcbf1fdccc42f3a46c9619c86ab6 | |
parent | a7ec08e2b5a78e05212562763d1927223c243d78 (diff) | |
download | poky-e2bb4a70a99a057d45316bbac65d6044ea54c484.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: 42232782b9a3aa0ed03c5dda84fc0b865b74b2dd)
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>
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.7.8/neon.m4-fix-includes-and-cflags.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.7.8.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.8/neon.m4-fix-includes-and-cflags.patch b/meta/recipes-devtools/subversion/subversion-1.7.8/neon.m4-fix-includes-and-cflags.patch new file mode 100644 index 0000000000..013d0c3649 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.8/neon.m4-fix-includes-and-cflags.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Fix to get correct SVN_NEON_CONFIG and CFLAGS when sysroot path contains '-D' and '-I' | ||
2 | characters. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
7 | |||
8 | index 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.8.bb b/meta/recipes-devtools/subversion/subversion_1.7.8.bb index 6aced2878d..0e3d844df8 100644 --- a/meta/recipes-devtools/subversion/subversion_1.7.8.bb +++ b/meta/recipes-devtools/subversion/subversion_1.7.8.bb | |||
@@ -12,6 +12,7 @@ inherit gettext | |||
12 | SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | 12 | 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://neon.m4-fix-includes-and-cflags.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[md5sum] = "454b9f398415c3504435bf8c3f6ed127" | 17 | SRC_URI[md5sum] = "454b9f398415c3504435bf8c3f6ed127" |
17 | SRC_URI[sha256sum] = "fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686" | 18 | SRC_URI[sha256sum] = "fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686" |