Commit 4751bddd authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Make GTK2 support opt-in 



This is bitrotting, nobody is stepping up to work on it, and since we
treat warnings as errors, feature detection is failing in its main,
faster test (tools/build/feature/test-all.c) because of the GTK+2
infobar check.

So make this opt-in, at some point ditch this if nobody volunteers to
take care of this.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 09b54b30

tools/build/Makefile.feature

+2 −3
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ FEATURE_TESTS_BASIC := \ 
        get_current_dir_name            \

        gettid				\

        glibc                           \

        gtk2                            \

        gtk2-infobar                    \

        libbfd                          \

        libbfd-buildid			\

        libcap                          \
@@ -82,6 +80,8 @@ FEATURE_TESTS_EXTRA := \ 
         compile-32                     \

         compile-x32                    \

         cplus-demangle                 \

         gtk2                           \

         gtk2-infobar                   \

         hello                          \

         libbabeltrace                  \

         libbfd-liberty                 \
@@ -112,7 +112,6 @@ FEATURE_DISPLAY ?= \ 
         dwarf                  \

         dwarf_getlocations     \

         glibc                  \

         gtk2                   \

         libbfd                 \

         libbfd-buildid		\

         libcap                 \

tools/build/feature/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ __BUILDXX = $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,%.cpp,$( 
###############################



$(OUTPUT)test-all.bin:

	$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma

	$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -I/usr/include/slang -lslang $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma



$(OUTPUT)test-hello.bin:

	$(BUILD)

tools/build/feature/test-all.c

+0 −10
Original line number Diff line number Diff line
@@ -78,14 +78,6 @@ 
# include "test-libslang.c"

#undef main



#define main main_test_gtk2

# include "test-gtk2.c"

#undef main



#define main main_test_gtk2_infobar

# include "test-gtk2-infobar.c"

#undef main



#define main main_test_libbfd

# include "test-libbfd.c"

#undef main
@@ -209,8 +201,6 @@ int main(int argc, char *argv[]) 
	main_test_libelf_getshdrstrndx();

	main_test_libunwind();

	main_test_libslang();

	main_test_gtk2(argc, argv);

	main_test_gtk2_infobar(argc, argv);

	main_test_libbfd();

	main_test_libbfd_buildid();

	main_test_backtrace();

tools/perf/Makefile.config

+3 −1
Original line number Diff line number Diff line
@@ -724,12 +724,14 @@ ifndef NO_SLANG 
  endif

endif



ifndef NO_GTK2

ifdef GTK2

  FLAGS_GTK2=$(CFLAGS) $(LDFLAGS) $(EXTLIBS) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)

  $(call feature_check,gtk2)

  ifneq ($(feature-gtk2), 1)

    msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev);

    NO_GTK2 := 1

  else

    $(call feature_check,gtk2-infobar)

    ifeq ($(feature-gtk2-infobar), 1)

      GTK_CFLAGS := -DHAVE_GTK_INFO_BAR_SUPPORT

    endif

tools/perf/Makefile.perf

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ include ../scripts/utilities.mak 
#

# Define NO_SLANG if you do not want TUI support.

#

# Define NO_GTK2 if you do not want GTK+ GUI support.

# Define GTK2 if you want GTK+ GUI support.

#

# Define NO_DEMANGLE if you do not want C++ symbol demangling.

#
@@ -386,7 +386,7 @@ ifneq ($(OUTPUT),) 
  CFLAGS += -I$(OUTPUT)

endif



ifndef NO_GTK2

ifdef GTK2

  ALL_PROGRAMS += $(OUTPUT)libperf-gtk.so

  GTK_IN := $(OUTPUT)gtk-in.o

endif
@@ -886,7 +886,7 @@ check: $(OUTPUT)common-cmds.h 


### Installation rules



ifndef NO_GTK2

ifdef GTK2

install-gtk: $(OUTPUT)libperf-gtk.so

	$(call QUIET_INSTALL, 'GTK UI') \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'; \