[libvirt] [PATCH] virt-login-shell: also build virAtomic.h

Guido Günther agx at sigxcpu.org
Tue Nov 5 19:13:30 UTC 2013


On Tue, Nov 05, 2013 at 09:01:29AM -0700, Eric Blake wrote:
> On 11/05/2013 08:44 AM, Guido Günther wrote:
> > Needed for architectures that don't use gcc atomic ops but pthread. This
> > fixes the armel build that otherwise breaks like:
> > 
> >  CCLD     virt-login-shell
> >  ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-virobject.o): In function `virClassNew':
> >  /«PKGBUILDDIR»/debian/build/src/../../../src/util/virobject.c:150: undefined reference to `virAtomicLock'
> >  ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-virobject.o): In function `virObjectNew':
> >  /«PKGBUILDDIR»/debian/build/src/../../../src/util/virobject.c:202: undefined reference to `virAtomicLock'
> >  ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-virobject.o): In function `virObjectUnref':
> >  /«PKGBUILDDIR»/debian/build/src/../../../src/util/virobject.c:274: undefined reference to `virAtomicLock'
> >  ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-virobject.o): In function `virObjectRef':
> >  /«PKGBUILDDIR»/debian/build/src/../../../src/util/virobject.c:295: undefined reference to `virAtomicLock'
> >  collect2: error: ld returned 1 exit status
> > 
> > See https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=armel&ver=1.1.4-1&stamp=1383588268
> > ---
> >  src/Makefile.am | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/src/Makefile.am b/src/Makefile.am
> > index 21b9caf..ad39b74 100644
> > --- a/src/Makefile.am
> > +++ b/src/Makefile.am
> > @@ -1982,6 +1982,8 @@ noinst_LTLIBRARIES += libvirt-setuid-rpc-client.la
> >  
> >  libvirt_setuid_rpc_client_la_SOURCES = 		\
> >  		util/viralloc.c			\
> > +		util/viratomic.c		\
> > +		util/viratomic.h		\
> 
> Technically, we don't need to list .h in _SOURCES (automake is smart
> enough to distribute any .h file for a similarly named .c file).  But
> we're already inconsistent in this list (some files have the .h listed,
> others don't), so it doesn't hurt.

Pushed. Thanks.
 -- Guido




More information about the libvir-list mailing list