Patchwork man: use '#' instead of ', ' as separator in configure

login
register
mail settings
Submitter rongqing.li@windriver.com
Date May 21, 2014, 2:16 a.m.
Message ID <1400638600-22676-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/72455/
State New
Headers show

Comments

rongqing.li@windriver.com - May 21, 2014, 2:16 a.m.
From: yzhu1 <yanjun.zhu@windriver.com>

$CC is able to has ',', when $CC includes some flags, which will trigger error,
like:
    | Creating Makefile from Makefile.in
    | sed: -e expression #1, char 72: unknown option to `s'
    |
    | sed: -e expression #1, char 72: unknown option to `s'

So use '#' instead of ',' as separator, it is more safe for the case.

Signed-off-by: yzhu1 <yanjun.zhu@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 meta/recipes-extended/man/man/man-configure.patch |   23 +++++++++++++++++++++
 meta/recipes-extended/man/man_1.6g.bb             |    1 +
 2 files changed, 24 insertions(+)
 create mode 100644 meta/recipes-extended/man/man/man-configure.patch
Ross Burton - May 21, 2014, 9:14 a.m.
On 21 May 2014 03:16,  <rongqing.li@windriver.com> wrote:
> $CC is able to has ',', when $CC includes some flags,

Presumably you're referring to flags such as -Wl,-O1.  Shouldn't these
flags be set in CPPFLAGS/CFLAGS/LDFLAGS, or can you give an example of
where they need to be set in CC.

Ross

Patch

diff --git a/meta/recipes-extended/man/man/man-configure.patch b/meta/recipes-extended/man/man/man-configure.patch
new file mode 100644
index 0000000..edef7d4
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-configure.patch
@@ -0,0 +1,23 @@ 
+Upstream-Status: Pending
+
+$CC is able to has ',', when $CC includes some flags, which will trigger error,
+like:
+    | Creating Makefile from Makefile.in
+    | sed: -e expression #1, char 72: unknown option to `s'
+    |
+    | sed: -e expression #1, char 72: unknown option to `s'
+
+So use '#' instead of ',' as separator
+
+Signed-off-by: yzhu1 <yanjun.zhu@windriver.com>
+--- a/configure
++++ 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 a66e01c..a2b16d2 100644
--- a/meta/recipes-extended/man/man_1.6g.bb
+++ b/meta/recipes-extended/man/man_1.6g.bb
@@ -34,6 +34,7 @@  SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \
            file://man-1.5m2-sigpipe.patch \
            file://man-1.6e-i18n_whatis.patch \
            file://man-1.6e-new_sections.patch \
+           file://man-configure.patch \
            file://man.1.gz;unpack=false \
            file://man.7.gz;unpack=false \
            file://man.conf \