Patchwork perf: Remove CFLAGS and LDFLAGS override

login
register
mail settings
Submitter Otavio Salvador
Date Sept. 16, 2013, 1:37 a.m.
Message ID <1379295470-3444-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/58073/
State New
Headers show

Comments

Otavio Salvador - Sept. 16, 2013, 1:37 a.m.
The kernel build system does the right thing here and we should stop
overriding it. This code has been added based on a change from
'meta-metro' layer, revision 9d698004137c1a888d40d6a4808d94afa22387e7,
without any information about what problem it fixes so I am reverting
it.

Using the CFLAGS makes it impossible for kernel build system to append
to it, thus making the build fail in various ways as:

|     CC /.../perf/1.0-r8/perf-1.0/perf.o
| In file included from builtin.h:4:0,
|                  from perf.c:9:
| util/util.h:74:24: fatal error: lk/debugfs.h: No such file or directory
|  #include <lk/debugfs.h>
|                         ^
| compilation terminated.

Cc: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-kernel/perf/perf.bb | 6 ------
 1 file changed, 6 deletions(-)
Saul Wold - Sept. 16, 2013, 7:10 a.m.
On 09/15/2013 06:37 PM, Otavio Salvador wrote:
> The kernel build system does the right thing here and we should stop
> overriding it. This code has been added based on a change from
> 'meta-metro' layer, revision 9d698004137c1a888d40d6a4808d94afa22387e7,
> without any information about what problem it fixes so I am reverting
> it.
>
> Using the CFLAGS makes it impossible for kernel build system to append
> to it, thus making the build fail in various ways as:
>
> |     CC /.../perf/1.0-r8/perf-1.0/perf.o
> | In file included from builtin.h:4:0,
> |                  from perf.c:9:
> | util/util.h:74:24: fatal error: lk/debugfs.h: No such file or directory
> |  #include <lk/debugfs.h>
> |                         ^
> | compilation terminated.
>
> Cc: Christopher Larson <kergoth@gmail.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   meta/recipes-kernel/perf/perf.bb | 6 ------
>   1 file changed, 6 deletions(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index d2c1048..8d35fc6 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -72,13 +72,7 @@ EXTRA_OEMAKE = \
>   		NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
>   		'
>
> -# We already pass the correct arguments to our compiler for the CFLAGS (if we
> -# don't override it, it'll add -m32/-m64 itself). For LDFLAGS, it was failing
> -# to find bfd symbols.
>   EXTRA_OEMAKE += "\
> -	'CFLAGS=${CFLAGS} -fPIC' \
> -	'LDFLAGS=${LDFLAGS} -lpthread -lrt -lelf -lm -lbfd' \
> -	\
Maybe not, I got a compile error with this on the Autobuilder.

http://autobuilder.yoctoproject.org:8011/builders/nightly-x86-64/builds/286/steps/Building%20Images/logs/stdio

Sau!

>   	'prefix=${prefix}' \
>   	'bindir=${bindir}' \
>   	'sharedir=${datadir}' \
>
Otavio Salvador - Sept. 16, 2013, 11:01 a.m.
On Mon, Sep 16, 2013 at 4:10 AM, Saul Wold <sgw@linux.intel.com> wrote:
> On 09/15/2013 06:37 PM, Otavio Salvador wrote:
>>
>> The kernel build system does the right thing here and we should stop
>> overriding it. This code has been added based on a change from
>> 'meta-metro' layer, revision 9d698004137c1a888d40d6a4808d94afa22387e7,
>> without any information about what problem it fixes so I am reverting
>> it.
>>
>> Using the CFLAGS makes it impossible for kernel build system to append
>> to it, thus making the build fail in various ways as:
>>
>> |     CC /.../perf/1.0-r8/perf-1.0/perf.o
>> | In file included from builtin.h:4:0,
>> |                  from perf.c:9:
>> | util/util.h:74:24: fatal error: lk/debugfs.h: No such file or directory
>> |  #include <lk/debugfs.h>
>> |                         ^
>> | compilation terminated.
>>
>> Cc: Christopher Larson <kergoth@gmail.com>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>   meta/recipes-kernel/perf/perf.bb | 6 ------
>>   1 file changed, 6 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/perf/perf.bb
>> b/meta/recipes-kernel/perf/perf.bb
>> index d2c1048..8d35fc6 100644
>> --- a/meta/recipes-kernel/perf/perf.bb
>> +++ b/meta/recipes-kernel/perf/perf.bb
>> @@ -72,13 +72,7 @@ EXTRA_OEMAKE = \
>>                 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
>>                 '
>>
>> -# We already pass the correct arguments to our compiler for the CFLAGS
>> (if we
>> -# don't override it, it'll add -m32/-m64 itself). For LDFLAGS, it was
>> failing
>> -# to find bfd symbols.
>>   EXTRA_OEMAKE += "\
>> -       'CFLAGS=${CFLAGS} -fPIC' \
>> -       'LDFLAGS=${LDFLAGS} -lpthread -lrt -lelf -lm -lbfd' \
>> -       \
>
> Maybe not, I got a compile error with this on the Autobuilder.
>
> http://autobuilder.yoctoproject.org:8011/builders/nightly-x86-64/builds/286/steps/Building%20Images/logs/stdio

I only reproduce this error if I build with EXTRA_CFLAGS set. There
are no other changes in perf?
Otavio Salvador - Sept. 16, 2013, 1:53 p.m.
On Mon, Sep 16, 2013 at 8:01 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Mon, Sep 16, 2013 at 4:10 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> On 09/15/2013 06:37 PM, Otavio Salvador wrote:
>>>
>>> The kernel build system does the right thing here and we should stop
>>> overriding it. This code has been added based on a change from
>>> 'meta-metro' layer, revision 9d698004137c1a888d40d6a4808d94afa22387e7,
>>> without any information about what problem it fixes so I am reverting
>>> it.
>>>
>>> Using the CFLAGS makes it impossible for kernel build system to append
>>> to it, thus making the build fail in various ways as:
>>>
>>> |     CC /.../perf/1.0-r8/perf-1.0/perf.o
>>> | In file included from builtin.h:4:0,
>>> |                  from perf.c:9:
>>> | util/util.h:74:24: fatal error: lk/debugfs.h: No such file or directory
>>> |  #include <lk/debugfs.h>
>>> |                         ^
>>> | compilation terminated.
>>>
>>> Cc: Christopher Larson <kergoth@gmail.com>
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>> ---
>>>   meta/recipes-kernel/perf/perf.bb | 6 ------
>>>   1 file changed, 6 deletions(-)
>>>
>>> diff --git a/meta/recipes-kernel/perf/perf.bb
>>> b/meta/recipes-kernel/perf/perf.bb
>>> index d2c1048..8d35fc6 100644
>>> --- a/meta/recipes-kernel/perf/perf.bb
>>> +++ b/meta/recipes-kernel/perf/perf.bb
>>> @@ -72,13 +72,7 @@ EXTRA_OEMAKE = \
>>>                 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
>>>                 '
>>>
>>> -# We already pass the correct arguments to our compiler for the CFLAGS
>>> (if we
>>> -# don't override it, it'll add -m32/-m64 itself). For LDFLAGS, it was
>>> failing
>>> -# to find bfd symbols.
>>>   EXTRA_OEMAKE += "\
>>> -       'CFLAGS=${CFLAGS} -fPIC' \
>>> -       'LDFLAGS=${LDFLAGS} -lpthread -lrt -lelf -lm -lbfd' \
>>> -       \
>>
>> Maybe not, I got a compile error with this on the Autobuilder.
>>
>> http://autobuilder.yoctoproject.org:8011/builders/nightly-x86-64/builds/286/steps/Building%20Images/logs/stdio
>
> I only reproduce this error if I build with EXTRA_CFLAGS set. There
> are no other changes in perf?

I reproduced the error too. I am on it but still have no clue why it
worked and now fails.

Checking...
Bruce Ashfield - Sept. 16, 2013, 2:48 p.m.
On Mon, Sep 16, 2013 at 9:53 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Mon, Sep 16, 2013 at 8:01 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> On Mon, Sep 16, 2013 at 4:10 AM, Saul Wold <sgw@linux.intel.com> wrote:
>>> On 09/15/2013 06:37 PM, Otavio Salvador wrote:
>>>>
>>>> The kernel build system does the right thing here and we should stop
>>>> overriding it. This code has been added based on a change from
>>>> 'meta-metro' layer, revision 9d698004137c1a888d40d6a4808d94afa22387e7,
>>>> without any information about what problem it fixes so I am reverting
>>>> it.
>>>>
>>>> Using the CFLAGS makes it impossible for kernel build system to append
>>>> to it, thus making the build fail in various ways as:
>>>>
>>>> |     CC /.../perf/1.0-r8/perf-1.0/perf.o
>>>> | In file included from builtin.h:4:0,
>>>> |                  from perf.c:9:
>>>> | util/util.h:74:24: fatal error: lk/debugfs.h: No such file or directory
>>>> |  #include <lk/debugfs.h>
>>>> |                         ^
>>>> | compilation terminated.
>>>>
>>>> Cc: Christopher Larson <kergoth@gmail.com>
>>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>>> ---
>>>>   meta/recipes-kernel/perf/perf.bb | 6 ------
>>>>   1 file changed, 6 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-kernel/perf/perf.bb
>>>> b/meta/recipes-kernel/perf/perf.bb
>>>> index d2c1048..8d35fc6 100644
>>>> --- a/meta/recipes-kernel/perf/perf.bb
>>>> +++ b/meta/recipes-kernel/perf/perf.bb
>>>> @@ -72,13 +72,7 @@ EXTRA_OEMAKE = \
>>>>                 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
>>>>                 '
>>>>
>>>> -# We already pass the correct arguments to our compiler for the CFLAGS
>>>> (if we
>>>> -# don't override it, it'll add -m32/-m64 itself). For LDFLAGS, it was
>>>> failing
>>>> -# to find bfd symbols.
>>>>   EXTRA_OEMAKE += "\
>>>> -       'CFLAGS=${CFLAGS} -fPIC' \
>>>> -       'LDFLAGS=${LDFLAGS} -lpthread -lrt -lelf -lm -lbfd' \
>>>> -       \
>>>
>>> Maybe not, I got a compile error with this on the Autobuilder.
>>>
>>> http://autobuilder.yoctoproject.org:8011/builders/nightly-x86-64/builds/286/steps/Building%20Images/logs/stdio
>>
>> I only reproduce this error if I build with EXTRA_CFLAGS set. There
>> are no other changes in perf?
>
> I reproduced the error too. I am on it but still have no clue why it
> worked and now fails.

I've also reproduced it. Will report if I find anything interesting.
The problem is that
I don' t have Otavio's case to test against, so if we fix this, we'll
probably just re-break
his build.

Bruce

>
> Checking...
>
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Otavio Salvador - Sept. 16, 2013, 4:15 p.m.
On Mon, Sep 16, 2013 at 11:48 AM, Bruce Ashfield
<bruce.ashfield@gmail.com> wrote:
> On Mon, Sep 16, 2013 at 9:53 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> On Mon, Sep 16, 2013 at 8:01 AM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>>> On Mon, Sep 16, 2013 at 4:10 AM, Saul Wold <sgw@linux.intel.com> wrote:
>>>> On 09/15/2013 06:37 PM, Otavio Salvador wrote:
>>>>>
>>>>> The kernel build system does the right thing here and we should stop
>>>>> overriding it. This code has been added based on a change from
>>>>> 'meta-metro' layer, revision 9d698004137c1a888d40d6a4808d94afa22387e7,
>>>>> without any information about what problem it fixes so I am reverting
>>>>> it.
>>>>>
>>>>> Using the CFLAGS makes it impossible for kernel build system to append
>>>>> to it, thus making the build fail in various ways as:
>>>>>
>>>>> |     CC /.../perf/1.0-r8/perf-1.0/perf.o
>>>>> | In file included from builtin.h:4:0,
>>>>> |                  from perf.c:9:
>>>>> | util/util.h:74:24: fatal error: lk/debugfs.h: No such file or directory
>>>>> |  #include <lk/debugfs.h>
>>>>> |                         ^
>>>>> | compilation terminated.
>>>>>
>>>>> Cc: Christopher Larson <kergoth@gmail.com>
>>>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>>>> ---
>>>>>   meta/recipes-kernel/perf/perf.bb | 6 ------
>>>>>   1 file changed, 6 deletions(-)
>>>>>
>>>>> diff --git a/meta/recipes-kernel/perf/perf.bb
>>>>> b/meta/recipes-kernel/perf/perf.bb
>>>>> index d2c1048..8d35fc6 100644
>>>>> --- a/meta/recipes-kernel/perf/perf.bb
>>>>> +++ b/meta/recipes-kernel/perf/perf.bb
>>>>> @@ -72,13 +72,7 @@ EXTRA_OEMAKE = \
>>>>>                 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
>>>>>                 '
>>>>>
>>>>> -# We already pass the correct arguments to our compiler for the CFLAGS
>>>>> (if we
>>>>> -# don't override it, it'll add -m32/-m64 itself). For LDFLAGS, it was
>>>>> failing
>>>>> -# to find bfd symbols.
>>>>>   EXTRA_OEMAKE += "\
>>>>> -       'CFLAGS=${CFLAGS} -fPIC' \
>>>>> -       'LDFLAGS=${LDFLAGS} -lpthread -lrt -lelf -lm -lbfd' \
>>>>> -       \
>>>>
>>>> Maybe not, I got a compile error with this on the Autobuilder.
>>>>
>>>> http://autobuilder.yoctoproject.org:8011/builders/nightly-x86-64/builds/286/steps/Building%20Images/logs/stdio
>>>
>>> I only reproduce this error if I build with EXTRA_CFLAGS set. There
>>> are no other changes in perf?
>>
>> I reproduced the error too. I am on it but still have no clue why it
>> worked and now fails.
>
> I've also reproduced it. Will report if I find anything interesting.
> The problem is that
> I don' t have Otavio's case to test against, so if we fix this, we'll
> probably just re-break
> his build.

I did a fix for it and am adding it for my builder for testing. Will
send if it proves to work there.

Patch

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index d2c1048..8d35fc6 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -72,13 +72,7 @@  EXTRA_OEMAKE = \
 		NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
 		'
 
-# We already pass the correct arguments to our compiler for the CFLAGS (if we
-# don't override it, it'll add -m32/-m64 itself). For LDFLAGS, it was failing
-# to find bfd symbols.
 EXTRA_OEMAKE += "\
-	'CFLAGS=${CFLAGS} -fPIC' \
-	'LDFLAGS=${LDFLAGS} -lpthread -lrt -lelf -lm -lbfd' \
-	\
 	'prefix=${prefix}' \
 	'bindir=${bindir}' \
 	'sharedir=${datadir}' \