[PATCH] man: replace ',' with '#'

[PATCH] man: replace ',' with '#'

[wenzong.fan]

From: Yue Tao <Yue.Tao@windriver.com>

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

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
---
 meta/recipes-extended/man/man/configure_sed.patch | 22 ++++++++++++++++++++++
 meta/recipes-extended/man/man_1.6g.bb             |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 meta/recipes-extended/man/man/configure_sed.patch

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..6c047ac
--- /dev/null
+++ b/meta/recipes-extended/man/man/configure_sed.patch
@@ -0,0 +1,22 @@
+man: replace ',' with '#'
+
+Sometimes, the parameters of CC contains the ',', which
+cause the sed command failed, so replace the ',' with '#'
+
+Upstream-Status: Pending
+
+Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
+---
+diff --git a/configure.old b/configure
+index 9f62cf9..b439055 100755
+--- a/configure.old
++++ b/configure
+@@ -1321,7 +1321,7 @@ 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,@INSTALL@,$INSTALL,
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"
-- 
1.9.1

Re: [PATCH] man: replace ',' with '#'

[Richard Purdie]

On Thu, 2015-07-02 at 09:25 +0800, wenzong.fan@windriver.com wrote:
> From: Yue Tao <Yue.Tao@windriver.com>
> 
> Sometimes, the parameters of CC contains the ',', which
> cause the sed command failed, so replace the ',' with '#'

What about BUILD_CC? Not sure if there are any linker parameters in
there?

Cheers,

Richard

> Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
> ---
>  meta/recipes-extended/man/man/configure_sed.patch | 22 ++++++++++++++++++++++
>  meta/recipes-extended/man/man_1.6g.bb             |  1 +
>  2 files changed, 23 insertions(+)
>  create mode 100644 meta/recipes-extended/man/man/configure_sed.patch
> 
> 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..6c047ac
> --- /dev/null
> +++ b/meta/recipes-extended/man/man/configure_sed.patch
> @@ -0,0 +1,22 @@
> +man: replace ',' with '#'
> +
> +Sometimes, the parameters of CC contains the ',', which
> +cause the sed command failed, so replace the ',' with '#'
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
> +---
> +diff --git a/configure.old b/configure
> +index 9f62cf9..b439055 100755
> +--- a/configure.old
> ++++ b/configure
> +@@ -1321,7 +1321,7 @@ 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,@INSTALL@,$INSTALL,
> 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"
> -- 
> 1.9.1
> 

Re: [PATCH] man: replace ',' with '#'

[wenzong fan]

On 07/02/2015 04:05 PM, Richard Purdie wrote:
> On Thu, 2015-07-02 at 09:25 +0800, wenzong.fan@windriver.com wrote:
>> From: Yue Tao <Yue.Tao@windriver.com>
>>
>> Sometimes, the parameters of CC contains the ',', which
>> cause the sed command failed, so replace the ',' with '#'
>
> What about BUILD_CC? Not sure if there are any linker parameters in
> there?

I didn't find an example, but in theory it's possible.

I have updated the patch and send V2 for reviewing.

Thanks
Wenzong

>
> Cheers,
>
> Richard
>
>> Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
>> ---
>>   meta/recipes-extended/man/man/configure_sed.patch | 22 ++++++++++++++++++++++
>>   meta/recipes-extended/man/man_1.6g.bb             |  1 +
>>   2 files changed, 23 insertions(+)
>>   create mode 100644 meta/recipes-extended/man/man/configure_sed.patch
>>
>> 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..6c047ac
>> --- /dev/null
>> +++ b/meta/recipes-extended/man/man/configure_sed.patch
>> @@ -0,0 +1,22 @@
>> +man: replace ',' with '#'
>> +
>> +Sometimes, the parameters of CC contains the ',', which
>> +cause the sed command failed, so replace the ',' with '#'
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
>> +---
>> +diff --git a/configure.old b/configure
>> +index 9f62cf9..b439055 100755
>> +--- a/configure.old
>> ++++ b/configure
>> +@@ -1321,7 +1321,7 @@ 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,@INSTALL@,$INSTALL,
>> 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"
>> --
>> 1.9.1
>>
>
>
>
>