diff options
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch')
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch | 32 |
1 files changed, 0 insertions, 32 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 deleted file mode 100644 index 013d0c3649..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 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" | ||
