| Message ID | 1524763162-4865-7-git-send-email-brad@nextdimension.cc (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/26/18 19:19, Brad Love wrote: > This check was consistently failing on all systems tested. > The path to object directory is used here to explicitly override > CWD. The thought is, if frame_vector.c exists in the build > directory then the build system has determined it is required, > and the source therefore should be compiled. The module will > not be built unless the build system has enabled it's config > option anyways, so this change should be safe in all circumstances. > > Signed-off-by: Brad Love <brad@nextdimension.cc> > --- > v4l/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/v4l/Makefile b/v4l/Makefile > index b512600..270a624 100644 > --- a/v4l/Makefile > +++ b/v4l/Makefile > @@ -88,7 +88,7 @@ ifneq ($(filter $(no-makefile-media-targets), $(MAKECMDGOALS)),) > endif > > makefile-mm := 1 > -ifeq ($(wildcard ../linux/mm/frame_vector.c),) > +ifeq ("$(wildcard $(obj)/frame_vector.c)","") > makefile-mm := 0 > endif > > Ah, nice. Hopefully this fixes this issue. I never could figure out why it failed for some people. Regards, Hans
diff --git a/v4l/Makefile b/v4l/Makefile index b512600..270a624 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -88,7 +88,7 @@ ifneq ($(filter $(no-makefile-media-targets), $(MAKECMDGOALS)),) endif makefile-mm := 1 -ifeq ($(wildcard ../linux/mm/frame_vector.c),) +ifeq ("$(wildcard $(obj)/frame_vector.c)","") makefile-mm := 0 endif
This check was consistently failing on all systems tested. The path to object directory is used here to explicitly override CWD. The thought is, if frame_vector.c exists in the build directory then the build system has determined it is required, and the source therefore should be compiled. The module will not be built unless the build system has enabled it's config option anyways, so this change should be safe in all circumstances. Signed-off-by: Brad Love <brad@nextdimension.cc> --- v4l/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)