diff options
author | Yue Tao <Yue.Tao@windriver.com> | 2015-07-03 16:53:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-08 00:01:22 +0100 |
commit | 44544fca58043c1f7f9cad6d9c288ff18bce99fc (patch) | |
tree | 1d8748428305f1684d02eedcefab3a5ad1915c93 /meta/recipes-extended/man | |
parent | 09febe09dc7481dcd08dc3cb033ea85e0e75abff (diff) | |
download | poky-44544fca58043c1f7f9cad6d9c288ff18bce99fc.tar.gz |
man: replace ',' with '#'
Sometimes, the parameters of CC/BUILD_CC contains the ',', which
cause the sed command failed, so replace the ',' with '#'
(From OE-Core rev: b493467d77081becfc419dff817d28a171736924)
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/man')
-rw-r--r-- | meta/recipes-extended/man/man/configure_sed.patch | 32 | ||||
-rw-r--r-- | meta/recipes-extended/man/man_1.6g.bb | 1 |
2 files changed, 33 insertions, 0 deletions
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 @@ | |||
1 | man: replace ',' with '#' | ||
2 | |||
3 | Sometimes, the parameters of CC/BUILD_CC contains the ',', which | ||
4 | cause the sed command failed, so replace the ',' with '#' | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Yue Tao <Yue.Tao@windriver.com> | ||
9 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
10 | --- | ||
11 | configure | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/configure b/configure | ||
15 | index 9f62cf9..9a565ae 100755 | ||
16 | --- a/configure | ||
17 | +++ b/configure | ||
18 | @@ -1321,9 +1321,9 @@ do | ||
19 | echo "Creating $infile from $infile.in" | ||
20 | sed -e ' | ||
21 | s,@version@,$version, | ||
22 | -s,@CC@,$CC, | ||
23 | +s#@CC@#$CC# | ||
24 | s,@EXEEXT@,$EXEEXT, | ||
25 | -s,@BUILD_CC@,$BUILD_CC, | ||
26 | +s#@BUILD_CC@#$BUILD_CC# | ||
27 | s,@INSTALL@,$INSTALL, | ||
28 | s,@DEFS@,$DEFS, | ||
29 | s,@LIBS@,$LIBS, | ||
30 | -- | ||
31 | 1.9.1 | ||
32 | |||
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 | |||
52 | file://man.conf \ | 52 | file://man.conf \ |
53 | file://manpath.5.gz;unpack=false \ | 53 | file://manpath.5.gz;unpack=false \ |
54 | file://man-1.6g-whatis3.patch \ | 54 | file://man-1.6g-whatis3.patch \ |
55 | file://configure_sed.patch \ | ||
55 | " | 56 | " |
56 | 57 | ||
57 | SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660" | 58 | SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660" |