[libvirt] [PATCH] build: Fix check-driverimpls in VPATH
DRIVER_SOURCE_FILES mixes files with absolute path (inherited from REMOTE_DRIVER_GENERATED) with file paths that are relative to srcdir but check-driverimpls.pl needs full paths. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6c626ac..9a17f59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -468,7 +468,8 @@ DRIVER_SOURCE_FILES = \ check-driverimpls: $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ - $(DRIVER_SOURCE_FILES) + $(filter /%,$(DRIVER_SOURCE_FILES)) \ + $(addprefix $(srcdir)/,$(filter-out /%,$(DRIVER_SOURCE_FILES))) EXTRA_DIST += check-driverimpls.pl -- 1.8.2.1
On 05/16/2013 12:20 AM, Jiri Denemark wrote:
DRIVER_SOURCE_FILES mixes files with absolute path (inherited from REMOTE_DRIVER_GENERATED) with file paths that are relative to srcdir but check-driverimpls.pl needs full paths. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
ACK. Thank goodness we already require GNU make; doing this in portable make would be a nightmare.
diff --git a/src/Makefile.am b/src/Makefile.am index 6c626ac..9a17f59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -468,7 +468,8 @@ DRIVER_SOURCE_FILES = \
check-driverimpls: $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ - $(DRIVER_SOURCE_FILES) + $(filter /%,$(DRIVER_SOURCE_FILES)) \ + $(addprefix $(srcdir)/,$(filter-out /%,$(DRIVER_SOURCE_FILES)))
EXTRA_DIST += check-driverimpls.pl
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Thu, May 16, 2013 at 06:58:56 -0600, Eric Blake wrote:
On 05/16/2013 12:20 AM, Jiri Denemark wrote:
DRIVER_SOURCE_FILES mixes files with absolute path (inherited from REMOTE_DRIVER_GENERATED) with file paths that are relative to srcdir but check-driverimpls.pl needs full paths. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
ACK. Thank goodness we already require GNU make; doing this in portable make would be a nightmare.
Yeah, it would be easier to pass srcdir to check-driverimpls.pl and do the processing there in that case. Luckily we don't have to do that. I pushed the patch, thanks. Jirka
participants (2)
-
Eric Blake -
Jiri Denemark