[libvirt] [PATCH 0/2] Fix build with glibc-2.26 and clean up
Not pushed as build fix as glibc-2.26 is not that spread and the second patch is not a build fix. Review should be trivial, so hopefully almost no review bandwidth goes to waste ;) Martin Kletzander (2): build: Use XDR_CFLAGS in more places tests: Remove pointless _CFLAGS variables tests/Makefile.am | 28 +--------------------------- tools/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 28 deletions(-) -- 2.15.0
Since update to glibc-2.26 removed the /usr/include/rpc/rpc.h we used until now, it showed us a problem with not using XDR_CFLAGS properly. On linux that variable has usually -I/usr/include/tirpc because we already probe for it properly, we just don't use it everywhere we need. It is needed by wireshark dissector as well as testutilsqemu.c (through includes) so the build fails with: wireshark/src/packet-libvirt.c:33:10: fatal error: rpc/xdr.h: No such file or directory #include <rpc/xdr.h> ^~~~~~~~~~~ and In file included from ../src/logging/log_manager.h:29:0, from ../src/qemu/qemu_domain.h:40, from testutilsqemu.c:11: ../src/logging/log_protocol.h:9:10: fatal error: rpc/rpc.h: No such file or directory #include <rpc/rpc.h> ^~~~~~~~~~~ Since lot of tests use testutilsqemu.c it is easier to add XDR_CFLAGS to AM_CFLAGS than adding it to all $binary_CFLAGS. It's just for tests and we already have bunch of CFLAGS there anyway. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tests/Makefile.am | 1 + tools/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4627f5d2ba20..5686ea5198b2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -48,6 +48,7 @@ AM_CFLAGS = \ $(APPARMOR_CFLAGS) \ $(YAJL_CFLAGS) \ $(COVERAGE_CFLAGS) \ + $(XDR_CFLAGS) \ $(WARN_CFLAGS) AM_LDFLAGS = \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 7513a73ac020..2913bba8cce8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -428,7 +428,7 @@ if WITH_WIRESHARK_DISSECTOR ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la wireshark_src_libvirt_la_CPPFLAGS = \ - -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) + -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS) wireshark_src_libvirt_la_LDFLAGS = -avoid-version -module nodist_wireshark_src_libvirt_la_SOURCES = wireshark/src/plugin.c wireshark_src_libvirt_la_SOURCES = \ -- 2.15.0
If _CFLAGS for a binary is not specified it uses AM_CFLAGS. So doing $binary_CFLAGS = $(AM_CFLAGS) or $binary_CFLAGS = $(AM_CFLAGS) $(something_that_is_already_in_AM_CFLAGS) is pointless. So remove it for cleaner Makefile.am Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tests/Makefile.am | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5686ea5198b2..3441dab6f6bb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -541,7 +541,6 @@ libxlxml2domconfigtest_LDADD = $(libxl_LDADDS) $(LIBXML_LIBS) virmocklibxl_la_SOURCES = \ virmocklibxl.c -virmocklibxl_la_CFLAGS = $(AM_CFLAGS) virmocklibxl_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virmocklibxl_la_LIBADD = $(MOCKLIBS_LIBS) @@ -575,7 +574,6 @@ libqemutestdriver_la_LIBADD = $(qemu_LDADDS) qemucpumock_la_SOURCES = \ qemucpumock.c testutilshostcpus.h -qemucpumock_la_CFLAGS = $(AM_CFLAGS) qemucpumock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) qemucpumock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -586,7 +584,6 @@ qemuxml2argvtest_LDADD = libqemutestdriver.la $(LDADDS) $(LIBXML_LIBS) qemuxml2argvmock_la_SOURCES = \ qemuxml2argvmock.c -qemuxml2argvmock_la_CFLAGS = $(AM_CFLAGS) qemuxml2argvmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) qemuxml2argvmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -633,7 +630,6 @@ qemucapsprobe_LDADD = \ qemucapsprobemock_la_SOURCES = \ qemucapsprobemock.c -qemucapsprobemock_la_CFLAGS = $(AM_CFLAGS) qemucapsprobemock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) qemucapsprobemock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -653,7 +649,6 @@ qemucaps2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemucaps2xmlmock_la_SOURCES = \ qemucaps2xmlmock.c -qemucaps2xmlmock_la_CFLAGS = $(AM_CFLAGS) qemucaps2xmlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) qemucaps2xmlmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -778,13 +773,11 @@ endif ! WITH_VMWARE if WITH_BHYVE bhyvexml2argvmock_la_SOURCES = \ bhyvexml2argvmock.c -bhyvexml2argvmock_la_CFLAGS = $(AM_CFLAGS) bhyvexml2argvmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) bhyvexml2argvmock_la_LIBADD = $(MOCKLIBS_LIBS) bhyveargv2xmlmock_la_SOURCES = \ bhyveargv2xmlmock.c -bhyveargv2xmlmock_la_CFLAGS = $(AM_CFLAGS) bhyveargv2xmlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) bhyveargv2xmlmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -990,7 +983,6 @@ endif WITH_XEN vircapstest_LDADD = $(qemu_LDADDS) $(LDADDS) domaincapsmock_la_SOURCES = domaincapsmock.c -domaincapsmock_la_CFLAGS = $(AM_CFLAGS) domaincapsmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) domaincapsmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1014,7 +1006,6 @@ endif WITH_BHYVE virnetmessagetest_SOURCES = \ virnetmessagetest.c testutils.h testutils.c -virnetmessagetest_CFLAGS = $(XDR_CFLAGS) $(AM_CFLAGS) virnetmessagetest_LDADD = $(LDADDS) virnetsockettest_SOURCES = \ @@ -1024,24 +1015,20 @@ virnetsockettest_LDADD = $(LDADDS) virnetdaemontest_SOURCES = \ virnetdaemontest.c \ testutils.h testutils.c -virnetdaemontest_CFLAGS = $(XDR_CFLAGS) $(AM_CFLAGS) virnetdaemontest_LDADD = $(LDADDS) virnetdaemonmock_la_SOURCES = \ virnetdaemonmock.c -virnetdaemonmock_la_CFLAGS = $(AM_CFLAGS) virnetdaemonmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virnetdaemonmock_la_LIBADD = $(MOCKLIBS_LIBS) virnetserverclienttest_SOURCES = \ virnetserverclienttest.c \ testutils.h testutils.c -virnetserverclienttest_CFLAGS = $(XDR_CFLAGS) $(AM_CFLAGS) virnetserverclienttest_LDADD = $(LDADDS) virnetserverclientmock_la_SOURCES = \ virnetserverclientmock.c -virnetserverclientmock_la_CFLAGS = $(AM_CFLAGS) virnetserverclientmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virnetserverclientmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1124,7 +1111,6 @@ virportallocatortest_LDADD = $(LDADDS) virportallocatormock_la_SOURCES = \ virportallocatormock.c -virportallocatormock_la_CFLAGS = $(AM_CFLAGS) virportallocatormock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virportallocatormock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1134,7 +1120,6 @@ vircgrouptest_LDADD = $(LDADDS) vircgroupmock_la_SOURCES = \ vircgroupmock.c -vircgroupmock_la_CFLAGS = $(AM_CFLAGS) vircgroupmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) vircgroupmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1152,25 +1137,21 @@ virpcitest_LDADD = $(LDADDS) virpcimock_la_SOURCES = \ virpcimock.c -virpcimock_la_CFLAGS = $(AM_CFLAGS) virpcimock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virpcimock_la_LIBADD = $(MOCKLIBS_LIBS) virrandommock_la_SOURCES = \ virrandommock.c -virrandommock_la_CFLAGS = $(AM_CFLAGS) virrandommock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virrandommock_la_LIBADD = $(MOCKLIBS_LIBS) virhostcpumock_la_SOURCES = \ virhostcpumock.c -virhostcpumock_la_CFLAGS = $(AM_CFLAGS) virhostcpumock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virhostcpumock_la_LIBADD = $(MOCKLIBS_LIBS) virfilecachemock_la_SOURCES = \ virfilecachemock.c -virfilecachemock_la_CFLAGS = $(AM_CFLAGS) virfilecachemock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virfilecachemock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1181,7 +1162,6 @@ vircaps2xmltest_LDADD = $(LDADDS) virnumamock_la_SOURCES = \ virnumamock.c -virnumamock_la_CFLAGS = $(AM_CFLAGS) virnumamock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virnumamock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1211,7 +1191,6 @@ nssguesttest_LDADD = \ nssmock_la_SOURCES = \ nssmock.c -nssmock_la_CFLAGS = $(AM_CFLAGS) nssmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) nssmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1237,7 +1216,6 @@ endif ! WITH_NSS virdeterministichashmock_la_SOURCES = \ virdeterministichashmock.c -virdeterministichashmock_la_CFLAGS = $(AM_CFLAGS) virdeterministichashmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virdeterministichashmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1246,7 +1224,6 @@ test_libraries += virdeterministichashmock.la if WITH_YAJL virmacmaptest_SOURCES = \ virmacmaptest.c testutils.h testutils.c -virmacmaptest_CLFAGS = $(AM_CFLAGS) virmacmaptest_LDADD = $(LDADDS) test_programs += virmacmaptest @@ -1267,7 +1244,6 @@ virnetdevmock_la_LIBADD = $(MOCKLIBS_LIBS) virrotatingfiletest_SOURCES = \ virrotatingfiletest.c testutils.h testutils.c -virrotatingfiletest_CFLAGS = $(AM_CFLAGS) virrotatingfiletest_LDADD = $(LDADDS) if WITH_LINUX @@ -1280,7 +1256,6 @@ virnetdevbandwidthtest_SOURCES = \ virnetdevbandwidthtest_LDADD = $(LDADDS) $(LIBXML_LIBS) virusbmock_la_SOURCES = virusbmock.c -virusbmock_la_CFLAGS = $(AM_CFLAGS) virusbmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virusbmock_la_LIBADD = $(MOCKLIBS_LIBS) \ $(PROBES_O) \ @@ -1288,13 +1263,11 @@ virusbmock_la_LIBADD = $(MOCKLIBS_LIBS) \ virnetdevbandwidthmock_la_SOURCES = \ virnetdevbandwidthmock.c -virnetdevbandwidthmock_la_CFLAGS = $(AM_CFLAGS) virnetdevbandwidthmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virnetdevbandwidthmock_la_LIBADD = $(MOCKLIBS_LIBS) virtestmock_la_SOURCES = \ virtestmock.c -virtestmock_la_CFLAGS = $(AM_CFLAGS) virtestmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virtestmock_la_LIBADD = \ $(MOCKLIBS_LIBS) \ -- 2.15.0
On 11/16/2017 02:24 PM, Martin Kletzander wrote:
Not pushed as build fix as glibc-2.26 is not that spread and the second patch is not a build fix. Review should be trivial, so hopefully almost no review bandwidth goes to waste ;)
Martin Kletzander (2): build: Use XDR_CFLAGS in more places tests: Remove pointless _CFLAGS variables
tests/Makefile.am | 28 +--------------------------- tools/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 28 deletions(-)
ACK to both. Michal
participants (2)
-
Martin Kletzander -
Michal Privoznik