Improve the regex of sed command of SVN_SERF_INCLUDES macro of subversion

PATCH In review Kai Kang 2 participants 4 messages Jul 8, 2015 – Jul 9, 2015

lore

Share & tools

lore

Kai Kang

author

2015-07-08 09:05 UTC #0 lore raw

cover Improve the regex of sed command of SVN_SERF_INCLUDES macro of subversion

The following changes since commit 8ad9a434c9fd0300cf5c38c368b181b78421e95a:

bitbake: tests/data: Add new data tests (2015-07-01 15:40:21 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib kangkai/subversion
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/subversion

Kai Kang (1):
subversion: improve the regex of sed command of SVN_SERF_INCLUDES
macro

 .../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

Signature · 1 line

1.9.1

Kai Kang

author

2015-07-08 09:05 UTC #1 lore raw

PATCH 1/1 subversion: improve the regex of sed command of SVN_SERF_INCLUDES macro

[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 <[email protected]>

---
 .../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

meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch new file +31 -0

new file mode 100644
index 0000000..626923b
@@ -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 <[email protected]>
+Signed-off-by: Yue Tao <[email protected]>
+Signed-off-by: Kai Kang <[email protected]>
+
+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

meta/recipes-devtools/subversion/subversion_1.8.13.bb +1 -0

index a98be67..73ace61 100644
@@ -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"

Signature · 1 line

1.9.1

Martin Jansa

2015-07-08 10:36 UTC #2 lore raw

Re: [PATCH 1/1] subversion: improve the regex of sed command of SVN_SERF_INCLUDES macro

Quoted 7 lines · 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.

Seems to duplicate:
commit 04554b128c358e3c10f6581fd4506764a65240b8

Author: Jose Lamego <[email protected]>
Date:   Fri Jul 3 07:34:50 2015 +0000

subversion_1.8.13.bb: Regex modified to allow '-D' in paths

Quoted 65 lines

Signed-off-by Kai Kang <[email protected]>

---
 .../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

meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch new file +31 -0

new file mode 100644
index 0000000..626923b
@@ -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 <[email protected]>
+Signed-off-by: Yue Tao <[email protected]>
+Signed-off-by: Kai Kang <[email protected]>
+
+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

meta/recipes-devtools/subversion/subversion_1.8.13.bb +1 -0

index a98be67..73ace61 100644
@@ -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"

Signature · 7 lines

1.9.1

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Kang Kai

author

2015-07-09 01:57 UTC #3 lore raw

Re: [PATCH 1/1] subversion: improve the regex of sed command of SVN_SERF_INCLUDES macro

Quoted 8 lines · Martin Jansa

Quoted 7 lines · 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.

Quoted 6 lines

Seems to duplicate:
commit 04554b128c358e3c10f6581fd4506764a65240b8
Author: Jose Lamego <[email protected]>
Date:   Fri Jul 3 07:34:50 2015 +0000
subversion_1.8.13.bb: Regex modified to allow '-D' in paths

Thanks for pointing out it.

The patch is merged by subversion upstream with replacing '[[:space:]]' with ' '.

http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?r1=1594156&r2=1689824

Regards,
Kai

Quoted 66 lines

Signed-off-by Kai Kang <[email protected]>

---
  .../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

meta/recipes-devtools/subversion/subversion-1.8.13/Improve_the_regex_of_sed_command_of.patch new file +31 -0

new file mode 100644
index 0000000..626923b
@@ -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 <[email protected]>
+Signed-off-by: Yue Tao <[email protected]>
+Signed-off-by: Kai Kang <[email protected]>
+
+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

meta/recipes-devtools/subversion/subversion_1.8.13.bb +1 -0

index a98be67..73ace61 100644
@@ -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"

Signature · 7 lines

1.9.1

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 2 lines

Regards,
Neil | Kai Kang