Messages in this thread | | | Date | Mon, 28 Mar 2011 11:47:22 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH] Use the environment variable PYTHON if defined |
| |
Em Sun, Mar 27, 2011 at 04:14:08AM +0530, Raghavendra D Prabhu escreveu: > On systems with python{2,3} installed, perf build can break which can be fixed by > exporting PYTHON to the right value. Added support for PYTHON in the Makefile. > --- > tools/perf/Makefile | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-)
Can you please add your Signed-off-by line? Please check Documentation/SubmittingPatches, "12) Sign your work".
Also please check the encoding, I'm getting things like:
@@ -629,10 +632,11 @@ endif ifdef NO_LIBPYTHON BASIC_CFLAGS +=3D -DNO_LIBPYTHON else - PYTHON_EMBED_LDOPTS =3D $(shell python-config --ldflags 2>/dev/null) + PYTHON ?=3D /usr/bin/python + PYTHON_EMBED_LDOPTS =3D $(shell $(PYTHON)-config --ldflags 2>/dev/n= ull)
See the /dev/null line wrapping? Also the +=3D, perhaps sending as an attachment helps.
For more info please read Documentation/email-clients.txt .
The patch looks otherwise a fix, so please take care of the avove issues and resubmit,
Michael, if you could double check and give me your Acked-by, that would be appreciated :-)
Thanks,
- Arnaldo
> diff --git a/tools/perf/Makefile b/tools/perf/Makefile > index 7141c42..d998221 100644 > --- a/tools/perf/Makefile > +++ b/tools/perf/Makefile > @@ -149,6 +149,9 @@ endif > # > # Define NO_PERL if you do not want Perl scripts or libraries at all. > # > +# Define PYTHON to point to python binary if it is not > +# /usr/bin/python, it will be used/called as $PYTHON-config. > +# > # Define INTERNAL_QSORT to use Git's implementation of qsort(), which > # is a simplified version of the merge sort used in glibc. This is > # recommended if Git triggers O(n^2) behavior in your platform's qsort(). > @@ -629,10 +632,11 @@ endif > ifdef NO_LIBPYTHON > BASIC_CFLAGS += -DNO_LIBPYTHON > else > - PYTHON_EMBED_LDOPTS = $(shell python-config --ldflags 2>/dev/null) > + PYTHON ?= /usr/bin/python > + PYTHON_EMBED_LDOPTS = $(shell $(PYTHON)-config --ldflags 2>/dev/null) > PYTHON_EMBED_LDFLAGS = $(call strip-libs,$(PYTHON_EMBED_LDOPTS)) > PYTHON_EMBED_LIBADD = $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) > - PYTHON_EMBED_CCOPTS = `python-config --cflags 2>/dev/null` > + PYTHON_EMBED_CCOPTS = ` $(PYTHON)-config --cflags 2>/dev/null` > FLAGS_PYTHON_EMBED=$(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS) > ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED)),y) > BASIC_CFLAGS += -DNO_LIBPYTHON > -- > 1.7.4.1 > > -------------------------- > Raghavendra Prabhu > GPG ID:D72BE977 >
| |