Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754173AbaFXWu3 (ORCPT ); Tue, 24 Jun 2014 18:50:29 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:33588 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754085AbaFXWuZ (ORCPT ); Tue, 24 Jun 2014 18:50:25 -0400 From: Alexis Berlemont To: linux-kernel@vger.kernel.org Cc: Alexis Berlemont , jolsa@redhat.com, dsahern@gmail.com, mingo@kernel.org, sam@ravnborg.org, mmarek@suse.cz, namhyung@kernel.org Subject: [PATCH 11/13] perf kbuild: remove legacy script-related build variables Date: Wed, 25 Jun 2014 00:47:58 +0200 Message-Id: <1403650080-3130-12-git-send-email-alexis.berlemont@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403650080-3130-1-git-send-email-alexis.berlemont@gmail.com> References: <1403650080-3130-1-git-send-email-alexis.berlemont@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove NO_LIBPERL (replaced by CONFIG_LIBPERL) Remove NO_LIBPYTHON (replaced by CONFIG_LIBPYTHON) --- tools/perf/builtin-script.c | 6 ++-- tools/perf/config/Makefile | 51 +++++++++++---------------------- tools/perf/config/Makefile.fix-config | 16 ----------- tools/perf/config/Makefile.fix-legacy | 8 ------ tools/perf/util/trace-event-scripting.c | 13 +++++---- 5 files changed, 27 insertions(+), 67 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 9e9c91f..3e59b24 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1,3 +1,5 @@ +#include "generated/autoconf.h" + #include "builtin.h" #include "perf.h" @@ -1362,11 +1364,11 @@ int find_scripts(char **scripts_array, char **scripts_path_array) for_each_lang(scripts_path, scripts_dir, lang_dirent, lang_next) { snprintf(lang_path, MAXPATHLEN, "%s/%s", scripts_path, lang_dirent.d_name); -#ifdef NO_LIBPERL +#ifndef CONFIG_LIBPERL if (strstr(lang_path, "perl")) continue; #endif -#ifdef NO_LIBPYTHON +#ifndef CONFIG_LIBPYTHON if (strstr(lang_path, "python")) continue; #endif diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index f4b133e..0f8fa99 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -454,9 +454,7 @@ endif grep-libs = $(filter -l%,$(1)) strip-libs = $(filter-out -l%,$(1)) -ifdef NO_LIBPERL - CFLAGS += -DNO_LIBPERL -else +ifdef CONFIG_LIBPERL PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null) PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS)) PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS)) @@ -464,9 +462,8 @@ else FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS) ifneq ($(feature-libperl), 1) - CFLAGS += -DNO_LIBPERL - NO_LIBPERL := 1 msg := $(warning Missing perl devel files. Disabling perl scripting support, consider installing perl-ExtUtils-Embed); + $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBPERL) else LDFLAGS += $(PERL_EMBED_LDFLAGS) EXTLIBS += $(PERL_EMBED_LIBADD) @@ -481,27 +478,24 @@ ifdef CONFIG_TIMERFD endif endif -disable-python = $(eval $(disable-python_code)) -define disable-python_code - CFLAGS += -DNO_LIBPYTHON - $(if $(1),$(warning No $(1) was found)) - $(warning Python support will not be built) - NO_LIBPYTHON := 1 -endef +ifdef CONFIG_LIBPYTHON -override PYTHON := \ - $(call get-executable-or-default,PYTHON,python) + disable-python = $(eval $(disable-python_code)) + define disable-python_code + $(if $(1),$(warning No $(1) was found)) + $(warning Python support will not be built) + $(shell $(KCONFIG_SCRIPT) -d CONFIG_LIBPYTHON) + endef -ifndef PYTHON - $(call disable-python,python interpreter) -else + override PYTHON := \ + $(call get-executable-or-default,PYTHON,python) - PYTHON_WORD := $(call shell-wordify,$(PYTHON)) - - ifdef NO_LIBPYTHON - $(call disable-python) + ifndef PYTHON + $(call disable-python,python interpreter) else + PYTHON_WORD := $(call shell-wordify,$(PYTHON)) + override PYTHON_CONFIG := \ $(call get-executable-or-default,PYTHON_CONFIG,$(PYTHON)-config) @@ -522,18 +516,7 @@ else else ifneq ($(feature-libpython-version), 1) - $(warning Python 3 is not yet supported; please set) - $(warning PYTHON and/or PYTHON_CONFIG appropriately.) - $(warning If you also have Python 2 installed, then) - $(warning try something like:) - $(warning $(and ,)) - $(warning $(and ,) make PYTHON=python2) - $(warning $(and ,)) - $(warning Otherwise, disable Python support entirely:) - $(warning $(and ,)) - $(warning $(and ,) make NO_LIBPYTHON=1) - $(warning $(and ,)) - $(error $(and ,)) + $(call disable-python,python2 interpreter) else LDFLAGS += $(PYTHON_EMBED_LDFLAGS) EXTLIBS += $(PYTHON_EMBED_LIBADD) @@ -776,8 +759,6 @@ all: $(call store,PERL_EMBED_CCOPTS) $(call store,CONFIG_X86_64) $(call store,NO_LIBUNWIND) - $(call store,NO_LIBPERL) - $(call store,NO_LIBPYTHON) $(call store,ETC_PERFCONFIG_SQ) $(call store,DESTDIR_SQ) $(call store,bindir_SQ) diff --git a/tools/perf/config/Makefile.fix-config b/tools/perf/config/Makefile.fix-config index e63539f..3f0e33e 100644 --- a/tools/perf/config/Makefile.fix-config +++ b/tools/perf/config/Makefile.fix-config @@ -3,20 +3,4 @@ include $(KCONFIG_CONFIG) CONFIG := $(srctree)/scripts/config --file $(KCONFIG_CONFIG) -# NO_LIBPERL -ifdef CONFIG_LIBPERL -ifdef NO_LIBPERL -dummy := $(info Disabling CONFIG_LIBPERL) -dummy := $(shell $(CONFIG) -d CONFIG_LIBPERL) -endif -endif - -# NO_LIBPYTHON -ifdef CONFIG_LIBPYTHON -ifdef NO_LIBPYTHON -dummy := $(info Disabling CONFIG_LIBPYTHON) -dummy := $(shell $(CONFIG) -d CONFIG_LIBPYTHON) -endif -endif - all: diff --git a/tools/perf/config/Makefile.fix-legacy b/tools/perf/config/Makefile.fix-legacy index 20a4062..431c9bf 100644 --- a/tools/perf/config/Makefile.fix-legacy +++ b/tools/perf/config/Makefile.fix-legacy @@ -1,10 +1,2 @@ include $(KCONFIG_CONFIG) - -ifndef CONFIG_LIBPERL -NO_LIBPERL := 1 -endif - -ifndef CONFIG_LIBPYTHON -NO_LIBPYTHON := 1 -endif diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c index 57aaccc..4a70ef7 100644 --- a/tools/perf/util/trace-event-scripting.c +++ b/tools/perf/util/trace-event-scripting.c @@ -24,6 +24,7 @@ #include #include +#include "generated/autoconf.h" #include "../perf.h" #include "util.h" #include "trace-event.h" @@ -93,7 +94,7 @@ static void register_python_scripting(struct scripting_ops *scripting_ops) scripting_context = malloc(sizeof(struct scripting_context)); } -#ifdef NO_LIBPYTHON +#ifndef CONFIG_LIBPYTHON void setup_python_scripting(void) { register_python_scripting(&python_scripting_unsupported_ops); @@ -156,16 +157,16 @@ static void register_perl_scripting(struct scripting_ops *scripting_ops) scripting_context = malloc(sizeof(struct scripting_context)); } -#ifdef NO_LIBPERL +#ifdef CONFIG_LIBPERL +extern struct scripting_ops perl_scripting_ops; + void setup_perl_scripting(void) { - register_perl_scripting(&perl_scripting_unsupported_ops); + register_perl_scripting(&perl_scripting_ops); } #else -extern struct scripting_ops perl_scripting_ops; - void setup_perl_scripting(void) { - register_perl_scripting(&perl_scripting_ops); + register_perl_scripting(&perl_scripting_unsupported_ops); } #endif -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/