From nobody Sat Apr 27 19:11:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1510839100281300.2256271225426; Thu, 16 Nov 2017 05:31:40 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D31F91A4099; Thu, 16 Nov 2017 13:31:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8C742C7DB; Thu, 16 Nov 2017 13:31:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6598B1800BD3; Thu, 16 Nov 2017 13:31:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAGDOphW011023 for ; Thu, 16 Nov 2017 08:24:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9BF3F60486; Thu, 16 Nov 2017 13:24:51 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7034160560 for ; Thu, 16 Nov 2017 13:24:48 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.brq.redhat.com [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id 27F4A12014C for ; Thu, 16 Nov 2017 14:24:47 +0100 (CET) From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 16 Nov 2017 14:24:45 +0100 Message-Id: <1985ade9b4eb20904f7a74c3b46c41ffbdbe9c6c.1510838583.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] build: Use XDR_CFLAGS in more places X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 16 Nov 2017 13:31:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 wiresha= rk 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 ^~~~~~~~~~~ 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 ^~~~~~~~~~~ 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 --- 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 =3D \ $(APPARMOR_CFLAGS) \ $(YAJL_CFLAGS) \ $(COVERAGE_CFLAGS) \ + $(XDR_CFLAGS) \ $(WARN_CFLAGS) =20 AM_LDFLAGS =3D \ 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 =20 ws_plugin_LTLIBRARIES =3D wireshark/src/libvirt.la wireshark_src_libvirt_la_CPPFLAGS =3D \ - -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) + -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS) wireshark_src_libvirt_la_LDFLAGS =3D -avoid-version -module nodist_wireshark_src_libvirt_la_SOURCES =3D wireshark/src/plugin.c wireshark_src_libvirt_la_SOURCES =3D \ --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 19:11:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1510838894528768.5405096808266; Thu, 16 Nov 2017 05:28:14 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 073E761474; Thu, 16 Nov 2017 13:28:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 43BB760F8A; Thu, 16 Nov 2017 13:28:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 554EB1800BD2; Thu, 16 Nov 2017 13:28:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAGDOpfa011018 for ; Thu, 16 Nov 2017 08:24:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3667860F8A; Thu, 16 Nov 2017 13:24:51 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D7A5C503B9 for ; Thu, 16 Nov 2017 13:24:48 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.brq.redhat.com [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id 32B301201D7 for ; Thu, 16 Nov 2017 14:24:47 +0100 (CET) From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 16 Nov 2017 14:24:46 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] tests: Remove pointless _CFLAGS variables X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 16 Nov 2017 13:28:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" If _CFLAGS for a binary is not specified it uses AM_CFLAGS. So doing $binary_CFLAGS =3D $(AM_CFLAGS) or $binary_CFLAGS =3D $(AM_CFLAGS) $(something_that_is_already_in_AM_CFLAGS) is pointless. So remove it for cleaner Makefile.am Signed-off-by: Martin Kletzander --- 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 =3D $(libxl_LDADDS) $(LIBX= ML_LIBS) =20 virmocklibxl_la_SOURCES =3D \ virmocklibxl.c -virmocklibxl_la_CFLAGS =3D $(AM_CFLAGS) virmocklibxl_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virmocklibxl_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -575,7 +574,6 @@ libqemutestdriver_la_LIBADD =3D $(qemu_LDADDS) =20 qemucpumock_la_SOURCES =3D \ qemucpumock.c testutilshostcpus.h -qemucpumock_la_CFLAGS =3D $(AM_CFLAGS) qemucpumock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) qemucpumock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -586,7 +584,6 @@ qemuxml2argvtest_LDADD =3D libqemutestdriver.la $(LDADD= S) $(LIBXML_LIBS) =20 qemuxml2argvmock_la_SOURCES =3D \ qemuxml2argvmock.c -qemuxml2argvmock_la_CFLAGS =3D $(AM_CFLAGS) qemuxml2argvmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) qemuxml2argvmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -633,7 +630,6 @@ qemucapsprobe_LDADD =3D \ =20 qemucapsprobemock_la_SOURCES =3D \ qemucapsprobemock.c -qemucapsprobemock_la_CFLAGS =3D $(AM_CFLAGS) qemucapsprobemock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) qemucapsprobemock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -653,7 +649,6 @@ qemucaps2xmltest_LDADD =3D $(qemu_LDADDS) $(LDADDS) =20 qemucaps2xmlmock_la_SOURCES =3D \ qemucaps2xmlmock.c -qemucaps2xmlmock_la_CFLAGS =3D $(AM_CFLAGS) qemucaps2xmlmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) qemucaps2xmlmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -778,13 +773,11 @@ endif ! WITH_VMWARE if WITH_BHYVE bhyvexml2argvmock_la_SOURCES =3D \ bhyvexml2argvmock.c -bhyvexml2argvmock_la_CFLAGS =3D $(AM_CFLAGS) bhyvexml2argvmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) bhyvexml2argvmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 bhyveargv2xmlmock_la_SOURCES =3D \ bhyveargv2xmlmock.c -bhyveargv2xmlmock_la_CFLAGS =3D $(AM_CFLAGS) bhyveargv2xmlmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) bhyveargv2xmlmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -990,7 +983,6 @@ endif WITH_XEN vircapstest_LDADD =3D $(qemu_LDADDS) $(LDADDS) =20 domaincapsmock_la_SOURCES =3D domaincapsmock.c -domaincapsmock_la_CFLAGS =3D $(AM_CFLAGS) domaincapsmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) domaincapsmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -1014,7 +1006,6 @@ endif WITH_BHYVE =20 virnetmessagetest_SOURCES =3D \ virnetmessagetest.c testutils.h testutils.c -virnetmessagetest_CFLAGS =3D $(XDR_CFLAGS) $(AM_CFLAGS) virnetmessagetest_LDADD =3D $(LDADDS) =20 virnetsockettest_SOURCES =3D \ @@ -1024,24 +1015,20 @@ virnetsockettest_LDADD =3D $(LDADDS) virnetdaemontest_SOURCES =3D \ virnetdaemontest.c \ testutils.h testutils.c -virnetdaemontest_CFLAGS =3D $(XDR_CFLAGS) $(AM_CFLAGS) virnetdaemontest_LDADD =3D $(LDADDS) =20 virnetdaemonmock_la_SOURCES =3D \ virnetdaemonmock.c -virnetdaemonmock_la_CFLAGS =3D $(AM_CFLAGS) virnetdaemonmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virnetdaemonmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 virnetserverclienttest_SOURCES =3D \ virnetserverclienttest.c \ testutils.h testutils.c -virnetserverclienttest_CFLAGS =3D $(XDR_CFLAGS) $(AM_CFLAGS) virnetserverclienttest_LDADD =3D $(LDADDS) =20 virnetserverclientmock_la_SOURCES =3D \ virnetserverclientmock.c -virnetserverclientmock_la_CFLAGS =3D $(AM_CFLAGS) virnetserverclientmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virnetserverclientmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -1124,7 +1111,6 @@ virportallocatortest_LDADD =3D $(LDADDS) =20 virportallocatormock_la_SOURCES =3D \ virportallocatormock.c -virportallocatormock_la_CFLAGS =3D $(AM_CFLAGS) virportallocatormock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virportallocatormock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -1134,7 +1120,6 @@ vircgrouptest_LDADD =3D $(LDADDS) =20 vircgroupmock_la_SOURCES =3D \ vircgroupmock.c -vircgroupmock_la_CFLAGS =3D $(AM_CFLAGS) vircgroupmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) vircgroupmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -1152,25 +1137,21 @@ virpcitest_LDADD =3D $(LDADDS) =20 virpcimock_la_SOURCES =3D \ virpcimock.c -virpcimock_la_CFLAGS =3D $(AM_CFLAGS) virpcimock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virpcimock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 virrandommock_la_SOURCES =3D \ virrandommock.c -virrandommock_la_CFLAGS =3D $(AM_CFLAGS) virrandommock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virrandommock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 virhostcpumock_la_SOURCES =3D \ virhostcpumock.c -virhostcpumock_la_CFLAGS =3D $(AM_CFLAGS) virhostcpumock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virhostcpumock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 virfilecachemock_la_SOURCES =3D \ virfilecachemock.c -virfilecachemock_la_CFLAGS =3D $(AM_CFLAGS) virfilecachemock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virfilecachemock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -1181,7 +1162,6 @@ vircaps2xmltest_LDADD =3D $(LDADDS) =20 virnumamock_la_SOURCES =3D \ virnumamock.c -virnumamock_la_CFLAGS =3D $(AM_CFLAGS) virnumamock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virnumamock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -1211,7 +1191,6 @@ nssguesttest_LDADD =3D \ =20 nssmock_la_SOURCES =3D \ nssmock.c -nssmock_la_CFLAGS =3D $(AM_CFLAGS) nssmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) nssmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -1237,7 +1216,6 @@ endif ! WITH_NSS =20 virdeterministichashmock_la_SOURCES =3D \ virdeterministichashmock.c -virdeterministichashmock_la_CFLAGS =3D $(AM_CFLAGS) virdeterministichashmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virdeterministichashmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 @@ -1246,7 +1224,6 @@ test_libraries +=3D virdeterministichashmock.la if WITH_YAJL virmacmaptest_SOURCES =3D \ virmacmaptest.c testutils.h testutils.c -virmacmaptest_CLFAGS =3D $(AM_CFLAGS) virmacmaptest_LDADD =3D $(LDADDS) =20 test_programs +=3D virmacmaptest @@ -1267,7 +1244,6 @@ virnetdevmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 virrotatingfiletest_SOURCES =3D \ virrotatingfiletest.c testutils.h testutils.c -virrotatingfiletest_CFLAGS =3D $(AM_CFLAGS) virrotatingfiletest_LDADD =3D $(LDADDS) =20 if WITH_LINUX @@ -1280,7 +1256,6 @@ virnetdevbandwidthtest_SOURCES =3D \ virnetdevbandwidthtest_LDADD =3D $(LDADDS) $(LIBXML_LIBS) =20 virusbmock_la_SOURCES =3D virusbmock.c -virusbmock_la_CFLAGS =3D $(AM_CFLAGS) virusbmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virusbmock_la_LIBADD =3D $(MOCKLIBS_LIBS) \ $(PROBES_O) \ @@ -1288,13 +1263,11 @@ virusbmock_la_LIBADD =3D $(MOCKLIBS_LIBS) \ =20 virnetdevbandwidthmock_la_SOURCES =3D \ virnetdevbandwidthmock.c -virnetdevbandwidthmock_la_CFLAGS =3D $(AM_CFLAGS) virnetdevbandwidthmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virnetdevbandwidthmock_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 virtestmock_la_SOURCES =3D \ virtestmock.c -virtestmock_la_CFLAGS =3D $(AM_CFLAGS) virtestmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virtestmock_la_LIBADD =3D \ $(MOCKLIBS_LIBS) \ --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list