[poky] [PATCH 1/3] trace-cmd: fix cross-compilation

[Darren Hart]

On 12/30/2010 10:08 PM, Bruce Ashfield wrote:
> On Thu, Dec 30, 2010 at 5:29 PM, Darren Hart<dvhart at linux.intel.com>  wrote:
>> On 12/30/2010 01:02 PM, Bruce Ashfield wrote:
>>>
>>> On Tue, Dec 28, 2010 at 8:17 PM, Darren Hart<dvhart at linux.intel.com>
>>>   wrote:
>>>>
>>>> The trace-cmd Makefile forces certain variables, such as CC and AR.
>>>> It was using the host gcc and loader, fix it to use the poky-built
>>>> cross-compiler and linker.
>>>>
>>>> inherit pkgconfig to ensure we don't use the host pkg-config.
>>>>
>>>> Remove unecessary variables from the oemake commands, such as ARCH
>>>> and LD which aren't used by the Makefile.
>>>>
>>>> Signed-off-by: Darren Hart<dvhart at linux.intel.com>
>>>> CC: Tom Zanussi<tom.zanussi at intel.com>
>>>
>>> I actually hacked up the original of this one .. ;)
>>
>> Right, sorry, forgot to check git blame on this one.
>
> Probably wouldn't have helped, in the recipe re-org it looks like my blame
> was dropped :)
>
>>
>>>
>>>
>>>> ---
>>>>   meta/recipes-kernel/trace-cmd/trace-cmd_git.bb |   12 +++++-------
>>>>   1 files changed, 5 insertions(+), 7 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
>>>> b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
>>>> index e375afc..a7eca5f 100644
>>>> --- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
>>>> +++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
>>>> @@ -2,18 +2,16 @@ DESCRIPTION = "User interface to Ftrace"
>>>>   LICENSE = "GPL"
>>>>   LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>>>>
>>>> -PR = r1
>>>> +PR = r2
>>>>   PV = "1.0.4+git${SRCPV}"
>>>>
>>>> +inherit pkgconfig
>>>> +
>>>>   SRC_URI =
>>>> "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git"
>>>>   S = "${WORKDIR}/git"
>>>>
>>>> -
>>>> -do_compile() {
>>>> -       oe_runmake ARCH="${ARCH}" CC="${CC}" LD="${LD}" prefix=${prefix}
>>>> -}
>>>> +EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}'"
>>>
>>> So we've determined that we don't need ARCH anymore ? At one point
>>> this did. Or is it coming from the pkgconfig inheritance now ?
>>
>> Good question. My understanding of setting these variables here was to
>> override whatever the Makefile was using. This makefile doesn't use ARCH at
>
> They were initially imported from a non-bitbake build of the tool, so there
> very well could have been differences introduced simply by the history. But
> yes, they were passed to override the defaults of the trace-cmd Makefile
> and prevent the defaults from being used.
>
> At one point, there were arch specific switches in the build to adapt to a
> different userspace on a per-arch basis. But those changes were circa
> March 2010 and they never were picked up.
>
>> all. Am I missing something about how this is used?
>
> It doesn't look like it, I was more noticing that you dropped ARCH, and
> was just looking to see if there were more details than just the commit
> message.

Nope, looks like trace-cmd's Makefile has just changed some.

Are you OK with these patches then?

-- 
Darren Hart
Yocto Linux Kernel