[oe-commits] Yue Tao : man: replace ',' with '#'

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: b493467d77081becfc419dff817d28a171736924
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b493467d77081becfc419dff817d28a171736924

Author: Yue Tao <Yue.Tao at windriver.com>
Date:   Fri Jul  3 16:53:56 2015 +0800

man: replace ',' with '#'

Sometimes, the parameters of CC/BUILD_CC contains the ',', which
cause the sed command failed, so replace the ',' with '#'

Signed-off-by: Yue Tao <Yue.Tao at windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-extended/man/man/configure_sed.patch | 32 +++++++++++++++++++++++
 meta/recipes-extended/man/man_1.6g.bb             |  1 +
 2 files changed, 33 insertions(+)

diff --git a/meta/recipes-extended/man/man/configure_sed.patch b/meta/recipes-extended/man/man/configure_sed.patch
new file mode 100644
index 0000000..d49e683
--- /dev/null
+++ b/meta/recipes-extended/man/man/configure_sed.patch
@@ -0,0 +1,32 @@
+man: replace ',' with '#'
+
+Sometimes, the parameters of CC/BUILD_CC contains the ',', which
+cause the sed command failed, so replace the ',' with '#'
+
+Upstream-Status: Pending
+
+Signed-off-by: Yue Tao <Yue.Tao at windriver.com>
+Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 9f62cf9..9a565ae 100755
+--- a/configure
++++ b/configure
+@@ -1321,9 +1321,9 @@ do
+   echo "Creating $infile from $infile.in"
+   sed -e '
+ s, at version@,$version,
+-s, at CC@,$CC,
++s#@CC@#$CC#
+ s, at EXEEXT@,$EXEEXT,
+-s, at BUILD_CC@,$BUILD_CC,
++s#@BUILD_CC@#$BUILD_CC#
+ s, at INSTALL@,$INSTALL,
+ s, at DEFS@,$DEFS,
+ s, at LIBS@,$LIBS,
+-- 
+1.9.1
+
diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb
index d4a4b26..6a4c734 100644
--- a/meta/recipes-extended/man/man_1.6g.bb
+++ b/meta/recipes-extended/man/man_1.6g.bb
@@ -52,6 +52,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba
            file://man.conf \
            file://manpath.5.gz;unpack=false \
            file://man-1.6g-whatis3.patch \
+           file://configure_sed.patch \
 "
 
 SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"