[OE-core] [PATCH 1/1] subversion: improve the regex of sed command of SVN_SERF_INCLUDES macro

[Kai Kang]

[Yocto #7474]

The regex of sed command is too simple, which mangles any "-D" in
strings, for example, a project name is "My-Demo", it will be removed
from the path by the sed regex, which causes a build failure. Improving
it to only delete the -D behind of a space or the -D at start of a
string.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
 .../Improve_the_regex_of_sed_command_of.patch      | 31 ++++++++++++++++++++++
 .../subversion/subversion_1.8.13.bb                |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch

diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch
new file mode 100644
index 0000000..626923b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch
@@ -0,0 +1,31 @@
+Improve the regex of sed command of SVN_SERF_INCLUDES macro
+
+The regex of sed command is too simple, which mangles any "-D"
+in strings, for example, a project name is "My-Demo", it will
+be removed from the path by the sed regex, which causes a build
+failure. Improving it to only delete the -D behind of a space or
+the -D at start of a string.
+
+Reference:
+
+https://bugzilla.yoctoproject.org/show_bug.cgi?id=7874
+
+Upstream-Status: Submitted [http://mail-archives.apache.org/mod_mbox/subversion-dev/201507.mbox/%3C559CDA70.8030403%40windriver.com%3E]
+
+Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
+Signed-off-by: Yue Tao <yue.tao at windriver.com>
+Signed-off-by: Kai Kang <kai.kang at windriver.com>
+
+diff --git a/build/ac-macros/serf.m4.old b/build/ac-macros/serf.m4
+index 885c5a1..39969c6 100644
+--- a/build/ac-macros/serf.m4.old
++++ b/build/ac-macros/serf.m4
+@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
+         if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then
+           AC_MSG_RESULT([yes])
+           serf_found=yes
+-          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
++          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
+           SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` 
+           break
+         else
diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/meta/recipes-devtools/subversion/subversion_1.8.13.bb
index a98be67..73ace61 100644
--- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.8.13.bb
@@ -12,6 +12,7 @@ inherit gettext pythonnative
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://libtool2.patch \
            file://disable_macos.patch \
+           file://Improve_the_regex_of_sed_command_of.patch \
 "
 SRC_URI[md5sum] = "4413417b529d7bdf82f74e50df02e88b"
 SRC_URI[sha256sum] = "1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579"
-- 
1.9.1