Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Robert Yang <liezhi.yang@windriver.com>
To: Martin Jansa <martin.jansa@gmail.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 6/6] binconfig.bbclass: fix get_binconfig_mangle()
Date: Fri, 17 Feb 2017 11:33:14 +0800	[thread overview]
Message-ID: <6e0be2d7-a5ea-46d8-a1bb-b9caaa696abb@windriver.com> (raw)
In-Reply-To: <20170216105623.GA3621@jama>



On 02/16/2017 06:56 PM, Martin Jansa wrote:
> On Tue, Feb 14, 2017 at 10:25:11PM -0800, Robert Yang wrote:
>> The command was:
>> s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
>> s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
>> s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
>> s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
>> s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
>> s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
>>
>> The STAGING_LIBDIR and STAGING_INCDIR now contains WORKDIR, so the
>> result would be incorrect like:
>> TCL_INCLUDE_SPEC='-IFIXMESTAGINGDIRTARGET/usr/include/recipe-sysroot/usr/include/tcl8.6'
>>
>> Note, the "/usr/include/recipe-sysroot" is not needed. Move the last two
>> sed commands ahead will fix the problem.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>  meta/classes/binconfig.bbclass | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
>> index 5372294..1be5fc4 100644
>> --- a/meta/classes/binconfig.bbclass
>> +++ b/meta/classes/binconfig.bbclass
>> @@ -13,14 +13,14 @@ def get_binconfig_mangle(d):
>>          s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
>>          s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
>>          s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
>> +        s += " -e 's:-L${WORKDIR}:-LOELIBDIR:'"
>> +        s += " -e 's:-I${WORKDIR}:-I-IOEINCDIR:'"
>
> Is the "-I-I" intentional?

Sorry, it's a typo, updated in the repo:

diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 5372294..39c3e2b 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -13,14 +13,14 @@ def get_binconfig_mangle(d):
          s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
          s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
          s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
+        s += " -e 's:-L${WORKDIR}:-LOELIBDIR:'"
+        s += " -e 's:-I${WORKDIR}:-IOEINCDIR:'"
          s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
          s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
          s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
          s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
          s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
          s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
-        s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
-        s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
          if d.getVar("OE_BINCONFIG_EXTRA_MANGLE", False):
              s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE")

// Robert

>
>>          s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
>>          s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
>>          s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
>>          s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
>>          s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
>>          s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
>> -        s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
>> -        s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
>>          if d.getVar("OE_BINCONFIG_EXTRA_MANGLE", False):
>>              s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE")
>>
>> --
>> 2.10.2
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>


      reply	other threads:[~2017-02-17  3:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-15  6:25 [PATCH 0/6] fixes for nativesdk, tcl and binconfig.bbclass Robert Yang
2017-02-15  6:25 ` [PATCH 1/6] python-native: PROVIDES python-io-native Robert Yang
2017-02-15  6:25 ` [PATCH 2/6] btrfs-tools: remove udev from DEPENDS Robert Yang
2017-02-17 15:14   ` Burton, Ross
2017-02-20  2:24     ` Robert Yang
2017-02-15  6:25 ` [PATCH 3/6] tcl: extend to nativesdk Robert Yang
2017-02-15  6:25 ` [PATCH 4/6] gawk/json-glib/libcheck: " Robert Yang
2017-02-15  6:25 ` [PATCH 5/6] tcl: fix sed in do_install() Robert Yang
2017-02-15  6:25 ` [PATCH 6/6] binconfig.bbclass: fix get_binconfig_mangle() Robert Yang
2017-02-16 10:56   ` Martin Jansa
2017-02-17  3:33     ` Robert Yang [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6e0be2d7-a5ea-46d8-a1bb-b9caaa696abb@windriver.com \
    --to=liezhi.yang@windriver.com \
    --cc=martin.jansa@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox