[libvirt PATCH] nodedev: Makefile: Use AM_LDFLAGS_MOD_NOUNDEF with the installed library

Erik Skultety posted 1 patch 3 years, 9 months ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/5ec1f76f5e57fcc04b86aa8e47b5c4a601addd48.1592571245.git.eskultet@redhat.com
src/node_device/Makefile.inc.am | 1 +
1 file changed, 1 insertion(+)
[libvirt PATCH] nodedev: Makefile: Use AM_LDFLAGS_MOD_NOUNDEF with the installed library
Posted by Erik Skultety 3 years, 9 months ago
Rather than using the AM_LDFLAGS_MOD_NOUNDEF options with the noinstall
library that will come out of libtool from
libvirt_driver_nodedev_impl_la, use it with the installed version
libvirt_driver_nodedev_la.

Broken-by-commit: c44bffb9
Fixes: https://ci.centos.org/job/libvirt-rpm/systems=libvirt-fedora-32/1155/

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---
Technically a build fix, but I'd like one more pair of eyes to look at this,
especially if they understand libtool.

 src/node_device/Makefile.inc.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 5993165b56..abe26b23bf 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -37,6 +37,7 @@ if WITH_NODE_DEVICES
 noinst_LTLIBRARIES += libvirt_driver_nodedev_impl.la
 libvirt_driver_nodedev_la_SOURCES =
 libvirt_driver_nodedev_la_LIBADD = libvirt_driver_nodedev_impl.la
+libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
 mod_LTLIBRARIES += libvirt_driver_nodedev.la
 libvirt_driver_nodedev_impl_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)

--
2.26.2

Re: [libvirt PATCH] nodedev: Makefile: Use AM_LDFLAGS_MOD_NOUNDEF with the installed library
Posted by Daniel P. Berrangé 3 years, 9 months ago
On Fri, Jun 19, 2020 at 02:55:09PM +0200, Erik Skultety wrote:
> Rather than using the AM_LDFLAGS_MOD_NOUNDEF options with the noinstall
> library that will come out of libtool from
> libvirt_driver_nodedev_impl_la, use it with the installed version
> libvirt_driver_nodedev_la.
> 
> Broken-by-commit: c44bffb9
> Fixes: https://ci.centos.org/job/libvirt-rpm/systems=libvirt-fedora-32/1155/
> 
> Signed-off-by: Erik Skultety <eskultet@redhat.com>
> ---
> Technically a build fix, but I'd like one more pair of eyes to look at this,
> especially if they understand libtool.
> 
>  src/node_device/Makefile.inc.am | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
> index 5993165b56..abe26b23bf 100644
> --- a/src/node_device/Makefile.inc.am
> +++ b/src/node_device/Makefile.inc.am
> @@ -37,6 +37,7 @@ if WITH_NODE_DEVICES
>  noinst_LTLIBRARIES += libvirt_driver_nodedev_impl.la
>  libvirt_driver_nodedev_la_SOURCES =
>  libvirt_driver_nodedev_la_LIBADD = libvirt_driver_nodedev_impl.la
> +libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)

...and remove it from the libvirt_driver_nodedev_impl_la_LDFLAGS

>  mod_LTLIBRARIES += libvirt_driver_nodedev.la
>  libvirt_driver_nodedev_impl_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [libvirt PATCH] nodedev: Makefile: Use AM_LDFLAGS_MOD_NOUNDEF with the installed library
Posted by Erik Skultety 3 years, 9 months ago
On Fri, Jun 19, 2020 at 01:59:48PM +0100, Daniel P. Berrangé wrote:
> On Fri, Jun 19, 2020 at 02:55:09PM +0200, Erik Skultety wrote:
> > Rather than using the AM_LDFLAGS_MOD_NOUNDEF options with the noinstall
> > library that will come out of libtool from
> > libvirt_driver_nodedev_impl_la, use it with the installed version
> > libvirt_driver_nodedev_la.
> >
> > Broken-by-commit: c44bffb9
> > Fixes: https://ci.centos.org/job/libvirt-rpm/systems=libvirt-fedora-32/1155/
> >
> > Signed-off-by: Erik Skultety <eskultet@redhat.com>
> > ---
> > Technically a build fix, but I'd like one more pair of eyes to look at this,
> > especially if they understand libtool.
> >
> >  src/node_device/Makefile.inc.am | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
> > index 5993165b56..abe26b23bf 100644
> > --- a/src/node_device/Makefile.inc.am
> > +++ b/src/node_device/Makefile.inc.am
> > @@ -37,6 +37,7 @@ if WITH_NODE_DEVICES
> >  noinst_LTLIBRARIES += libvirt_driver_nodedev_impl.la
> >  libvirt_driver_nodedev_la_SOURCES =
> >  libvirt_driver_nodedev_la_LIBADD = libvirt_driver_nodedev_impl.la
> > +libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
>
> ...and remove it from the libvirt_driver_nodedev_impl_la_LDFLAGS

Damn, I must have dropped that from the git stage by accident, will do, do I
need to respin?

Erik

Re: [libvirt PATCH] nodedev: Makefile: Use AM_LDFLAGS_MOD_NOUNDEF with the installed library
Posted by Daniel P. Berrangé 3 years, 9 months ago
On Fri, Jun 19, 2020 at 03:03:50PM +0200, Erik Skultety wrote:
> On Fri, Jun 19, 2020 at 01:59:48PM +0100, Daniel P. Berrangé wrote:
> > On Fri, Jun 19, 2020 at 02:55:09PM +0200, Erik Skultety wrote:
> > > Rather than using the AM_LDFLAGS_MOD_NOUNDEF options with the noinstall
> > > library that will come out of libtool from
> > > libvirt_driver_nodedev_impl_la, use it with the installed version
> > > libvirt_driver_nodedev_la.
> > >
> > > Broken-by-commit: c44bffb9
> > > Fixes: https://ci.centos.org/job/libvirt-rpm/systems=libvirt-fedora-32/1155/
> > >
> > > Signed-off-by: Erik Skultety <eskultet@redhat.com>
> > > ---
> > > Technically a build fix, but I'd like one more pair of eyes to look at this,
> > > especially if they understand libtool.
> > >
> > >  src/node_device/Makefile.inc.am | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
> > > index 5993165b56..abe26b23bf 100644
> > > --- a/src/node_device/Makefile.inc.am
> > > +++ b/src/node_device/Makefile.inc.am
> > > @@ -37,6 +37,7 @@ if WITH_NODE_DEVICES
> > >  noinst_LTLIBRARIES += libvirt_driver_nodedev_impl.la
> > >  libvirt_driver_nodedev_la_SOURCES =
> > >  libvirt_driver_nodedev_la_LIBADD = libvirt_driver_nodedev_impl.la
> > > +libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
> >
> > ...and remove it from the libvirt_driver_nodedev_impl_la_LDFLAGS
> 
> Damn, I must have dropped that from the git stage by accident, will do, do I
> need to respin?

Feel free to add my Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
and push if that's added


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|