Re: [PATCH 07/32] perf kbuild: remove useless #ifdef directives

[Alexis Berlemont]

On Wed, Jun 4, 2014 at 3:53 AM, David Ahern <dsahern@xxxxxxxxx> wrote:
> missing commit message as to why the ifdef directives useless.
>

If I remember well, after having rebased Jiri Olsa's patches on the
current branch. The build procedure was not working correctly. So, the
first commits tried to fix the issues. The ifdef directives were no
more needed because they were moved elsewhere in more recent versions
(I think Jiri Olsa's patches were released in April 2013)

I now understand that these changes should have been integrated into
jiri's rebased commits. I will fix that.

> if I build perf after applying this patch and I don't have devel code for
> tui and gui will it still build?
>

Sidenote: after having applied _all_ the patches. If you build perf
and you don't have the tui / gui devel code, the absence of headers
will be detected by features test
(linux/tools/perf/config/features-checks/*) and the .config will be
updated accordingly. So, at build time, it should be ok. By the way, I
updated the non-regression procedure (available through the target
build-test); many .config files were automatically generated in
linux/tools/perf/tests/configs thanks a python script (which relies on
kconfiglib):
* for each option, there is a .config file in which the option is disabled
* a minimal .config file (nearly everything disabled) and a defconfig
/ allyesconfig file are  also tested.

Alexis.

> David
>
>
> On 6/3/14, 4:06 PM, Alexis Berlemont wrote:
>>
>> ---
>>   tools/perf/ui/setup.c | 8 --------
>>   1 file changed, 8 deletions(-)
>>
>> diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c
>> index 66ecd08..cb69740 100644
>> --- a/tools/perf/ui/setup.c
>> +++ b/tools/perf/ui/setup.c
>> @@ -71,20 +71,16 @@ void setup_browser(bool fallback_to_pager)
>>
>>         switch (use_browser) {
>>         case 2:
>> -#if defined(CONFIG_GUI) || !defined(CONFIG_KBUILD)
>>                 if (setup_gtk_browser() == 0)
>>                         break;
>>                 printf("GTK browser requested but could not find %s\n",
>>                        PERF_GTK_DSO);
>>                 sleep(1);
>> -#endif
>>                 /* fall through */
>> -#if defined(CONFIG_TUI) || !defined(CONFIG_KBUILD)
>>         case 1:
>>                 use_browser = 1;
>>                 if (ui__init() == 0)
>>                         break;
>> -#endif
>>                 /* fall through */
>>         default:
>>                 use_browser = 0;
>> @@ -100,16 +96,12 @@ void exit_browser(bool wait_for_ok __maybe_unused)
>>   {
>>         switch (use_browser) {
>>         case 2:
>> -#if defined(CONFIG_GUI) || !defined(CONFIG_KBUILD)
>>                 exit_gtk_browser(wait_for_ok);
>>                 break;
>> -#endif
>>
>> -#if defined(CONFIG_TUI) || !defined(CONFIG_KBUILD)
>>         case 1:
>>                 ui__exit(wait_for_ok);
>>                 break;
>> -#endif
>>
>>         default:
>>                 break;
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/