From nobody Sat Apr 27 20:30:09 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 1520263215322167.34209920766375; Mon, 5 Mar 2018 07:20:15 -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 BD3B5757D4; Mon, 5 Mar 2018 15:20:13 +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 91D8C60C7B; Mon, 5 Mar 2018 15:20:13 +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 4DC6A4A46F; Mon, 5 Mar 2018 15:20:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w25FKCUN023481 for ; Mon, 5 Mar 2018 10:20:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 57CAA61F59; Mon, 5 Mar 2018 15:20:12 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CD7361F5C for ; Mon, 5 Mar 2018 15:20:08 +0000 (UTC) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8B000C0587C3 for ; Mon, 5 Mar 2018 15:20:00 +0000 (UTC) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id A8C2E21175; Mon, 5 Mar 2018 10:19:59 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute6.internal (MEProxy); Mon, 05 Mar 2018 10:19:59 -0500 Received: from localhost (afel46.neoplus.adsl.tpnet.pl [95.49.115.46]) by mail.messagingengine.com (Postfix) with ESMTPA id 202C97E46B; Mon, 5 Mar 2018 10:19:58 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=z5FijSuLQzpE5LYjl2w5Q7XhoL8vrId8EFkPUPEv/sE=; b=RhhTp+sg xtjHzlruZMlykZ/QkKnvzTrxCjfMFRIi+LrpdjEApNkCGIIs6I80cwFwDCkBiJn7 TSyw9U/Vmnd5kvGARU7NwmJyaknfSDcTuiju2BznSjOh72FzY3IVT3HwEeHDGLCx s4w0CHLZB9d7Rmi96IB4fUDSkxUol5leg8YDyzKjSVEgoKI9JQ+MGIxaWASGTtrn Oo4Aw3DNSjROdhnw5raIxhb8Y9s3xM7BTQpEQ6/beDxigln443LDKOCXeoZS9wyM c4jAXDVC1j2+hHV3/7sMNZZN9yBNCX89CrCwR2xIU8JkEgxLdfpfsCrlAzdJk2Zk VlZoYfkA8KfQvw== X-ME-Sender: From: Jan Palus To: libvir-list@redhat.com Date: Mon, 5 Mar 2018 16:19:50 +0100 Message-Id: <20180305151950.7654-1-atler@pld-linux.org> In-Reply-To: <20180305142107.GT17368@redhat.com> References: <20180305142107.GT17368@redhat.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 05 Mar 2018 15:20:01 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 05 Mar 2018 15:20:01 +0000 (UTC) for IP:'66.111.4.29' DOMAIN:'out5-smtp.messagingengine.com' HELO:'out5-smtp.messagingengine.com' FROM:'jpalus@fastmail.com' RCPT:'' X-RedHat-Spam-Score: -0.202 (DKIM_SIGNED, DKIM_VALID, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS) 66.111.4.29 out5-smtp.messagingengine.com 66.111.4.29 out5-smtp.messagingengine.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Jan Palus Subject: [libvirt] [PATCH v2] make sure libvirt is linked first 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.26]); Mon, 05 Mar 2018 15:20:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" so it's not affected by flags that might be passed in $(*_LIBS) like -L/usr/lib which might result in linking against system library and requiring incorrect version of private symbols Signed-off-by: Jan Palus --- src/Makefile.am | 42 ++++++++++++++++++++++-------------------- src/lxc/Makefile.inc.am | 2 +- tools/Makefile.am | 2 +- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3bf2da5..3c83513 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1153,6 +1153,11 @@ libvirtd_LDFLAGS =3D \ $(NULL) =20 libvirtd_LDADD =3D \ + libvirt_driver_admin.la \ + libvirt-lxc.la \ + libvirt-qemu.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la $(LIBSOCKET) \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ @@ -1164,14 +1169,6 @@ if WITH_DTRACE_PROBES libvirtd_LDADD +=3D ../src/libvirt_probes.lo endif WITH_DTRACE_PROBES =20 -libvirtd_LDADD +=3D \ - libvirt_driver_admin.la \ - libvirt-lxc.la \ - libvirt-qemu.la \ - libvirt.la \ - ../gnulib/lib/libgnu.la $(LIBSOCKET) \ - $(NULL) - endif WITH_LIBVIRTD EXTRA_DIST +=3D \ remote/test_libvirtd.aug.in \ @@ -1222,7 +1219,7 @@ libvirt_driver_interface_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) $(LIBNL_CFLAGS) libvirt_driver_interface_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_interface_la_LIBADD =3D +libvirt_driver_interface_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.la if WITH_NETCF libvirt_driver_interface_la_CFLAGS +=3D $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD +=3D $(NETCF_LIBS) @@ -1231,7 +1228,6 @@ if WITH_UDEV 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_SOURCES =3D $(INTERFACE_DRIVER_SOURCES) endif WITH_INTERFACE =20 @@ -1323,7 +1319,6 @@ endif WITH_STORAGE_SCSI if WITH_STORAGE_MPATH libvirt_storage_backend_mpath_la_SOURCES =3D \ $(STORAGE_DRIVER_MPATH_SOURCES) -libvirt_storage_backend_mpath_la_LIBADD =3D $(DEVMAPPER_LIBS) libvirt_storage_backend_mpath_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(DEVMAPPER_CFLAGS) \ @@ -1331,7 +1326,10 @@ libvirt_storage_backend_mpath_la_CFLAGS =3D \ =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_mpath.la libvirt_storage_backend_mpath_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_mpath_la_LIBADD +=3D libvirt.la ../gnulib/lib/libg= nu.la +libvirt_storage_backend_mpath_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(DEVMAPPER_LIBS) endif WITH_STORAGE_MPATH =20 if WITH_STORAGE_DISK @@ -1347,7 +1345,6 @@ endif WITH_STORAGE_DISK =20 if WITH_STORAGE_RBD libvirt_storage_backend_rbd_la_SOURCES =3D $(STORAGE_DRIVER_RBD_SOURCES) -libvirt_storage_backend_rbd_la_LIBADD =3D $(LIBRBD_LIBS) libvirt_storage_backend_rbd_la_CFLAGS =3D \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ @@ -1355,7 +1352,10 @@ libvirt_storage_backend_rbd_la_CFLAGS =3D \ =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_rbd.la libvirt_storage_backend_rbd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_rbd_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu= .la +libvirt_storage_backend_rbd_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(LIBRBD_LIBS) endif WITH_STORAGE_RBD =20 if WITH_STORAGE_SHEEPDOG @@ -1380,7 +1380,6 @@ endif WITH_STORAGE_SHEEPDOG if WITH_STORAGE_GLUSTER libvirt_storage_backend_gluster_la_SOURCES =3D \ $(STORAGE_DRIVER_GLUSTER_SOURCES) -libvirt_storage_backend_gluster_la_LIBADD =3D $(GLUSTERFS_LIBS) libvirt_storage_backend_gluster_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(GLUSTERFS_CFLAGS) \ @@ -1388,7 +1387,10 @@ libvirt_storage_backend_gluster_la_CFLAGS =3D \ =20 storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_gluster.la libvirt_storage_backend_gluster_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_gluster_la_LIBADD +=3D libvirt.la ../gnulib/lib/li= bgnu.la +libvirt_storage_backend_gluster_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(GLUSTERFS_LIBS) endif WITH_STORAGE_GLUSTER =20 if WITH_STORAGE_ZFS @@ -1424,7 +1426,7 @@ libvirt_driver_nodedev_la_CFLAGS =3D \ -I$(srcdir)/conf \ $(AM_CFLAGS) $(LIBNL_CFLAGS) libvirt_driver_nodedev_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_nodedev_la_LIBADD =3D +libvirt_driver_nodedev_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.la =20 if WITH_HAL libvirt_driver_nodedev_la_SOURCES +=3D $(NODE_DEVICE_DRIVER_HAL_SOURCES) @@ -1437,7 +1439,6 @@ libvirt_driver_nodedev_la_CFLAGS +=3D $(UDEV_CFLAGS) = $(PCIACCESS_CFLAGS) libvirt_driver_nodedev_la_LIBADD +=3D $(UDEV_LIBS) $(PCIACCESS_LIBS) endif WITH_UDEV =20 -libvirt_driver_nodedev_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la endif WITH_NODE_DEVICES =20 =20 @@ -1456,10 +1457,11 @@ libvirt_driver_nwfilter_impl_la_CFLAGS =3D \ $(AM_CFLAGS) libvirt_driver_nwfilter_impl_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_driver_nwfilter_impl_la_LIBADD =3D \ + libvirt.la \ $(LIBPCAP_LIBS) \ $(LIBNL_LIBS) \ - $(DBUS_LIBS) -libvirt_driver_nwfilter_impl_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgn= u.la + $(DBUS_LIBS) \ + ../gnulib/lib/libgnu.la libvirt_driver_nwfilter_impl_la_SOURCES =3D $(NWFILTER_DRIVER_SOURCES) endif WITH_NWFILTER =20 diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 8a3d4c4..8dd2e9e 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -121,8 +121,8 @@ libvirt_lxc_LDFLAGS =3D \ $(LIBXML_LIBS) \ $(NULL) libvirt_lxc_LDADD =3D \ - $(FUSE_LIBS) \ libvirt.la \ + $(FUSE_LIBS) \ ../gnulib/lib/libgnu.la \ $(NULL) if WITH_DTRACE_PROBES diff --git a/tools/Makefile.am b/tools/Makefile.am index 85e640b..1452d98 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -139,9 +139,9 @@ libvirt_shell_la_LDFLAGS =3D \ $(COVERAGE_LDFLAGS) \ $(NULL) libvirt_shell_la_LIBADD =3D \ + ../src/libvirt.la \ $(LIBXML_LIBS) \ $(READLINE_LIBS) \ - ../src/libvirt.la \ ../gnulib/lib/libgnu.la \ $(NULL) libvirt_shell_la_SOURCES =3D vsh.c vsh.h --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list