From nobody Wed May 14 22:01:57 2025 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 15168731595711018.3537515074628; Thu, 25 Jan 2018 01:39:19 -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 A29DD8FAC0; Thu, 25 Jan 2018 09:39:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5ED6D65606; Thu, 25 Jan 2018 09:39:18 +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 224FA62CE9; Thu, 25 Jan 2018 09:39:18 +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 w0P9dGiD003338 for ; Thu, 25 Jan 2018 04:39:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id 87CEA605DC; Thu, 25 Jan 2018 09:39:16 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB0B06031B; Thu, 25 Jan 2018 09:39:07 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 25 Jan 2018 09:38:23 +0000 Message-Id: <20180125093825.5834-13-berrange@redhat.com> In-Reply-To: <20180125093825.5834-1-berrange@redhat.com> References: <20180125093825.5834-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/14] build: provide a AM_FLAGS_MOD for loadable modules 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: , Content-Type: text/plain; charset="utf-8" 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.27]); Thu, 25 Jan 2018 09:39:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Dynamic loadable modules all need a common set of linker flags -module -avoid-version $(AM_LDFLAGS) Bundle those up into a $(AM_LDFLAGS_MOD) to avoid repetition. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 69 +++++++++++++++++++++++------------------------------= ---- 1 file changed, 28 insertions(+), 41 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 492bbac22e..335b3a0c81 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,6 +51,7 @@ AM_LDFLAGS =3D $(DRIVER_MODULES_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) +AM_LDFLAGS_MOD =3D -module -avoid-version $(AM_LDFLAGS) =20 POD2MAN =3D pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" =20 @@ -1335,7 +1336,7 @@ libvirt_driver_xen_la_SOURCES =3D libvirt_driver_xen_la_LIBADD =3D libvirt_driver_xen_impl.la mod_LTLIBRARIES +=3D libvirt_driver_xen.la libvirt_driver_xen_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_xen_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_xen_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 libvirt_driver_xen_impl_la_CFLAGS =3D \ $(XEN_CFLAGS) \ @@ -1381,7 +1382,7 @@ libvirt_driver_vbox_la_LIBADD =3D libvirt_driver_vbox= _impl.la mod_LTLIBRARIES +=3D \ libvirt_driver_vbox.la libvirt_driver_vbox_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_vbox_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_vbox_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 libvirt_driver_vbox_impl_la_CFLAGS =3D \ -I$(srcdir)/conf \ @@ -1410,7 +1411,7 @@ libvirt_driver_libxl_la_SOURCES =3D libvirt_driver_libxl_la_LIBADD =3D libvirt_driver_libxl_impl.la mod_LTLIBRARIES +=3D libvirt_driver_libxl.la libvirt_driver_libxl_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_libxl_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_libxl_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 libvirt_driver_libxl_impl_la_CFLAGS =3D \ $(LIBXL_CFLAGS) \ @@ -1439,7 +1440,7 @@ libvirt_driver_qemu_la_SOURCES =3D libvirt_driver_qemu_la_LIBADD =3D libvirt_driver_qemu_impl.la mod_LTLIBRARIES +=3D libvirt_driver_qemu.la libvirt_driver_qemu_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_qemu_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_qemu_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 libvirt_driver_qemu_impl_la_CFLAGS =3D \ $(GNUTLS_CFLAGS) \ @@ -1474,7 +1475,7 @@ libvirt_driver_lxc_la_SOURCES =3D libvirt_driver_lxc_la_LIBADD =3D libvirt_driver_lxc_impl.la mod_LTLIBRARIES +=3D libvirt_driver_lxc.la libvirt_driver_lxc_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_lxc_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_lxc_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 libvirt_driver_lxc_impl_la_CFLAGS =3D \ $(LIBNL_CFLAGS) \ @@ -1511,7 +1512,7 @@ libvirt_driver_uml_la_SOURCES =3D libvirt_driver_uml_la_LIBADD =3D libvirt_driver_uml_impl.la mod_LTLIBRARIES +=3D libvirt_driver_uml.la libvirt_driver_uml_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_uml_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_uml_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 libvirt_driver_uml_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ @@ -1583,7 +1584,7 @@ libvirt_driver_vz_la_SOURCES =3D libvirt_driver_vz_la_LIBADD =3D libvirt_driver_vz_impl.la mod_LTLIBRARIES +=3D libvirt_driver_vz.la libvirt_driver_vz_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_vz_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_vz_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_driver_vz_impl_la_CFLAGS =3D \ -I$(srcdir)/conf \ -I$(srcdir)/access \ @@ -1599,7 +1600,7 @@ libvirt_driver_bhyve_la_SOURCES =3D libvirt_driver_bhyve_la_LIBADD =3D libvirt_driver_bhyve_impl.la mod_LTLIBRARIES +=3D libvirt_driver_bhyve.la libvirt_driver_bhyve_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_bhyve_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_bhyve_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 libvirt_driver_bhyve_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ @@ -1625,7 +1626,7 @@ libvirt_driver_network_la_LIBADD +=3D libvirt.la ../g= nulib/lib/libgnu.la \ $(LIBNL_LIBS) \ $(DBUS_LIBS) \ $(NULL) -libvirt_driver_network_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_network_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) =20 libvirt_driver_network_impl_la_CFLAGS =3D \ $(LIBNL_CFLAGS) \ @@ -1645,7 +1646,7 @@ libvirt_driver_interface_la_CFLAGS =3D \ -I$(srcdir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) $(LIBNL_CFLAGS) -libvirt_driver_interface_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_interface_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_driver_interface_la_LIBADD =3D if WITH_NETCF libvirt_driver_interface_la_CFLAGS +=3D $(NETCF_CFLAGS) @@ -1656,7 +1657,6 @@ libvirt_driver_interface_la_CFLAGS +=3D $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD +=3D $(UDEV_LIBS) endif WITH_UDEV libvirt_driver_interface_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_interface_la_LDFLAGS +=3D -module -avoid-version libvirt_driver_interface_la_SOURCES =3D $(INTERFACE_DRIVER_SOURCES) endif WITH_INTERFACE =20 @@ -1667,7 +1667,7 @@ libvirt_driver_secret_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) libvirt_driver_secret_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_secret_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_secret_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_driver_secret_la_SOURCES =3D $(SECRET_DRIVER_SOURCES) endif WITH_SECRETS =20 @@ -1695,7 +1695,7 @@ libvirt_driver_storage_la_SOURCES =3D libvirt_driver_storage_la_LIBADD =3D libvirt_driver_storage_impl.la mod_LTLIBRARIES +=3D libvirt_driver_storage.la libvirt_driver_storage_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_storage_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_storage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_driver_storage_impl_la_SOURCES +=3D $(STORAGE_DRIVER_SOURCES) =20 =20 @@ -1705,8 +1705,7 @@ libvirt_storage_backend_fs_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_fs.la -libvirt_storage_backend_fs_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_fs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_fs_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.la endif WITH_STORAGE =20 @@ -1718,8 +1717,7 @@ libvirt_storage_backend_logical_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_logical.la -libvirt_storage_backend_logical_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_logical_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_logical_la_LIBADD =3D libvirt.la ../gnulib/lib/lib= gnu.la endif WITH_STORAGE_LVM =20 @@ -1732,8 +1730,7 @@ libvirt_storage_backend_iscsi_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_iscsi.la -libvirt_storage_backend_iscsi_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_iscsi_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_iscsi_la_LIBADD =3D libvirt.la ../gnulib/lib/libgn= u.la endif WITH_STORAGE_ISCSI =20 @@ -1744,8 +1741,7 @@ libvirt_storage_backend_scsi_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_scsi.la -libvirt_storage_backend_scsi_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_scsi_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_scsi_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu= .la endif WITH_STORAGE_SCSI =20 @@ -1759,8 +1755,7 @@ libvirt_storage_backend_mpath_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_mpath.la -libvirt_storage_backend_mpath_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_mpath_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_mpath_la_LIBADD +=3D libvirt.la ../gnulib/lib/libg= nu.la endif WITH_STORAGE_MPATH =20 @@ -1771,8 +1766,7 @@ libvirt_storage_backend_disk_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_disk.la -libvirt_storage_backend_disk_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_disk_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_disk_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu= .la endif WITH_STORAGE_DISK =20 @@ -1785,8 +1779,7 @@ libvirt_storage_backend_rbd_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_rbd.la -libvirt_storage_backend_rbd_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_rbd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_rbd_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu= .la endif WITH_STORAGE_RBD =20 @@ -1806,8 +1799,7 @@ libvirt_storage_backend_sheepdog_priv_la_CFLAGS =3D \ noinst_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog_priv.la =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog.la -libvirt_storage_backend_sheepdog_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_sheepdog_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_sheepdog_la_LIBADD =3D libvirt.la ../gnulib/lib/li= bgnu.la endif WITH_STORAGE_SHEEPDOG =20 @@ -1821,8 +1813,7 @@ libvirt_storage_backend_gluster_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_gluster.la -libvirt_storage_backend_gluster_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_gluster_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_gluster_la_LIBADD +=3D libvirt.la ../gnulib/lib/li= bgnu.la endif WITH_STORAGE_GLUSTER =20 @@ -1833,8 +1824,7 @@ libvirt_storage_backend_zfs_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_zfs.la -libvirt_storage_backend_zfs_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_zfs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_zfs_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.= la endif WITH_STORAGE_ZFS =20 @@ -1846,8 +1836,7 @@ libvirt_storage_backend_vstorage_la_CFLAGS =3D \ $(AM_CFLAGS) =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_vstorage.la -libvirt_storage_backend_vstorage_la_LDFLAGS =3D \ - -module -avoid-version $(AM_LDFLAGS) +libvirt_storage_backend_vstorage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_storage_backend_vstorage_la_LIBADD =3D libvirt.la ../gnulib/lib/li= bgnu.la endif WITH_STORAGE_VSTORAGE =20 @@ -1860,7 +1849,7 @@ libvirt_driver_nodedev_la_CFLAGS =3D \ -I$(srcdir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) $(LIBNL_CFLAGS) -libvirt_driver_nodedev_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_nodedev_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_driver_nodedev_la_LIBADD =3D =20 if WITH_LIBVIRTD @@ -1877,7 +1866,6 @@ endif WITH_UDEV endif WITH_LIBVIRTD =20 libvirt_driver_nodedev_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_nodedev_la_LDFLAGS +=3D -module -avoid-version endif WITH_NODE_DEVICES =20 =20 @@ -1886,7 +1874,7 @@ noinst_LTLIBRARIES +=3D libvirt_driver_nwfilter_impl.= la libvirt_driver_nwfilter_la_SOURCES =3D libvirt_driver_nwfilter_la_LIBADD =3D libvirt_driver_nwfilter_impl.la mod_LTLIBRARIES +=3D libvirt_driver_nwfilter.la -libvirt_driver_nwfilter_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +libvirt_driver_nwfilter_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) libvirt_driver_nwfilter_impl_la_CFLAGS =3D \ $(LIBPCAP_CFLAGS) \ $(LIBNL_CFLAGS) \ @@ -1900,7 +1888,6 @@ libvirt_driver_nwfilter_impl_la_LIBADD =3D \ $(LIBNL_LIBS) \ $(DBUS_LIBS) libvirt_driver_nwfilter_impl_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgn= u.la -libvirt_driver_nwfilter_impl_la_LDFLAGS +=3D -module -avoid-version libvirt_driver_nwfilter_impl_la_SOURCES =3D $(NWFILTER_DRIVER_SOURCES) endif WITH_NWFILTER =20 @@ -2576,7 +2563,7 @@ lockd_la_SOURCES =3D \ lockd_la_CFLAGS =3D -I$(srcdir)/conf \ $(XDR_CFLAGS) \ $(AM_CFLAGS) -lockd_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +lockd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) lockd_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.la augeas_DATA +=3D locking/libvirt_lockd.aug if WITH_DTRACE_PROBES @@ -2855,7 +2842,7 @@ if WITH_SANLOCK lockdriver_LTLIBRARIES +=3D sanlock.la sanlock_la_SOURCES =3D $(LOCK_DRIVER_SANLOCK_SOURCES) sanlock_la_CFLAGS =3D -I$(srcdir)/conf $(AM_CFLAGS) -sanlock_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) +sanlock_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) sanlock_la_LIBADD =3D -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la =20 augeas_DATA +=3D locking/libvirt_sanlock.aug --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list