From b493467d77081becfc419dff817d28a171736924 Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Fri, 3 Jul 2015 16:53:56 +0800 Subject: 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 Signed-off-by: Wenzong Fan Signed-off-by: Ross Burton --- meta/recipes-extended/man/man/configure_sed.patch | 32 +++++++++++++++++++++++ meta/recipes-extended/man/man_1.6g.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-extended/man/man/configure_sed.patch (limited to 'meta') 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 0000000000..d49e6831d9 --- /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 +Signed-off-by: Wenzong Fan +--- + 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,@version@,$version, +-s,@CC@,$CC, ++s#@CC@#$CC# + s,@EXEEXT@,$EXEEXT, +-s,@BUILD_CC@,$BUILD_CC, ++s#@BUILD_CC@#$BUILD_CC# + s,@INSTALL@,$INSTALL, + s,@DEFS@,$DEFS, + s,@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 d4a4b26fc5..6a4c734051 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" -- cgit v1.2.3