Em Thu, Nov 26, 2015 at 07:50:55PM +0100, Jiri Olsa escreveu:
> On Thu, Nov 26, 2015 at 07:12:04PM +0100, Jiri Olsa wrote:
> > On Thu, Nov 26, 2015 at 01:31:30PM -0300, Arnaldo Carvalho de Melo wrote:
> > > Em Thu, Nov 26, 2015 at 02:54:03PM +0100, Jiri Olsa escreveu:
> > > > Using FEATURE-INCLUDE in bpf subproject in case bpf is built
> > > > via perf. Keep the current features detection for other cases.
> > > >
> > > > Cc: Wang Nan <wangn...@huawei.com>
> > > > Link:
> > > > http://lkml.kernel.org/n/tip-utuczk899ckz6qtggqvhm...@git.kernel.org
> > > > Signed-off-by: Jiri Olsa <jo...@kernel.org>
> > >
> > > Clashes with:
> > >
> > > d8ad6a15cc3a ("tools lib bpf: Don't do a feature check when cleaning")
> > >
> > > That has, at that point:
> > >
> > > +check_feat := 1
> > > +NON_CHECK_FEAT_TARGETS := clean TAGS tags cscope help
> > > +ifdef MAKECMDGOALS
> > > +ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),)
> > > + check_feat := 0
> > > +endif
> > > +endif
> > > +
> > > +ifeq ($(check_feat),1)
> > > include $(srctree)/tools/build/Makefile.feature
> > > +endif
> > >
> > > On a related note:
> > >
> > > [acme@zoo linux]$ make O=/tmp/build/perf -C tools/perf
> > > make: Entering directory '/home/git/linux/tools/perf'
> > > BUILD: Doing 'make -j4' parallel build
> > > make[2]: Nothing to be done for 'fixdep'.
> > > make: Leaving directory '/home/git/linux/tools/perf'
> > >
> > > Can we get away with that "make[2]: Nothing to be done for 'fixdep'."
> > > line?
> >
> > I'll check on that
>
> good we don't supress all make's output, sometimes it
> finds a bug ;-) please check with attached patch..
>
> thanks,
> jirka
Clashes with:
commit 5725dd8fa888b4dcdff58241f9d3d3ac42a048e2
Author: Wang Nan <wangn...@huawei.com>
Date: Tue Nov 24 13:36:06 2015 +0000
tools build: Clean CFLAGS and LDFLAGS for fixdep
And this should even be already in tip, let me see, yes:
https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=perf/core&id=5725dd8fa888b4dcdff58241f9d3d3ac42a048e2
I'm fixing this up, as this one is easy.
- Arnaldo
>
> ---
> Adding OUTPUT path prefix for fixdep target
> so we use it properly in out of tree builds.
>
> If the fixdep already existed in the tree, the out of
> tree build would see it already exist and did not build
> the out of tree version, as reported by Arnaldo:
>
> [acme@zoo linux]$ make O=/tmp/build/perf -C tools/perf
> make: Entering directory '/home/git/linux/tools/perf'
> BUILD: Doing 'make -j4' parallel build
> make[2]: Nothing to be done for 'fixdep'.
> make: Leaving directory '/home/git/linux/tools/perf'
>
> Reported-by: Arnaldo Carvalho de Melo <a...@redhat.com>
> Link: http://lkml.kernel.org/n/tip-hsrwmiogt9menjsg7uaxq...@git.kernel.org
> Signed-off-by: Jiri Olsa <jo...@kernel.org>
> ---
> tools/build/Makefile | 2 +-
> tools/build/Makefile.include | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/build/Makefile b/tools/build/Makefile
> index a93036272d43..0d5a0e3a8fa9 100644
> --- a/tools/build/Makefile
> +++ b/tools/build/Makefile
> @@ -25,7 +25,7 @@ export Q srctree CC LD
> MAKEFLAGS := --no-print-directory
> build := -f $(srctree)/tools/build/Makefile.build dir=. obj
>
> -all: fixdep
> +all: $(OUTPUT)fixdep
>
> clean:
> $(call QUIET_CLEAN, fixdep)
> diff --git a/tools/build/Makefile.include b/tools/build/Makefile.include
> index 4e09ad617a60..6d5edd275bef 100644
> --- a/tools/build/Makefile.include
> +++ b/tools/build/Makefile.include
> @@ -4,7 +4,7 @@ ifdef CROSS_COMPILE
> fixdep:
> else
> fixdep:
> - $(Q)$(MAKE) -C $(srctree)/tools/build fixdep
> + $(Q)$(MAKE) -C $(srctree)/tools/build $(OUTPUT)fixdep
> endif
>
> .PHONY: fixdep
> --
> 2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
