[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] build: avoid build failure without polkit



rpmbuild of mingw-libvirt.spec failed with:

  GEN      libvirt.syms
  GEN      libvirt_qemu.def
cat: libvirt_access.syms: No such file or directory
cat: libvirt_access_qemu.syms: No such file or directory
cat: libvirt_access_lxc.syms: No such file or directory

I traced this to unconditionally trying to use the ACL .syms files,
even when polkit isn't in use.

build: avoid build failure without polkit
* src/Makefile.am (USED_SYM_FILES): Mark access driver symbols
according to use.
---

Even though this fixes a build-breaker (./autobuild.sh), I'm
reluctant to push this without review.  In particular, I'm worried
that I may need a v2 that further conditionalizes whether
libvirt_access_qemu.syms is sometimes omitted based on rpm arguments,
even if libvirt_access.syms is present.

 src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4cf999d..042bcba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1469,12 +1469,13 @@ $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \

 CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY)
 BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY)
+USED_SYM_FILES += $(ACCESS_DRIVER_SYMFILES)
 else
 EXTRA_DIST += $(ACCESS_DRIVER_POLKIT_SOURCES)
+SYM_FILES += $(ACCESS_DRIVER_SYMFILES)
 endif


-USED_SYM_FILES += $(ACCESS_DRIVER_SYMFILES)
 BUILT_SOURCES += $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_SYMFILES)
 CLEANFILES += $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_SYMFILES)

-- 
1.8.1.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]