[Libvirt-cim] [PATCH] Fix a problem with multi-arch

[Daniel Veillard]

On Thu, Jan 12, 2012 at 12:52:16PM -0200, Eduardo Lima (Etrunko) wrote:
> On 01/12/2012 04:26 AM, Daniel Veillard wrote:
> > [ We carry the following patch in RHEL builds, I think it's best applied
> >   upstream :-) ]
> > 
> 
> Sure thing. One small doubt below.
> 
> > The /etc/ld.so.conf.d/libvirt-cim.conf file generated conflicted
> > between 23 bits and 64 bits arches leading to a multi-arch conflict.
> 
> Can I have some of these 23 bits machine? :P

  Simple, just take a wire cutter ...
The irony is that actually in terms of weird addressing model, your
company is still the one who wins without much competition (I'm sure I
compiled for 31bits support recently ;-)

> > Simply use a filename based on the expected architecture.
> > 
> > Signed-off-by: Daniel Veillard <veillard at redhat.com>
> > 
> > diff --git a/libvirt-cim.spec.in b/libvirt-cim.spec.in
> > index f3289db..d78eee7 100644
> > --- a/libvirt-cim.spec.in
> > +++ b/libvirt-cim.spec.in
> > @@ -54,7 +54,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.la
> >  rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.a
> >  rm -f $RPM_BUILD_ROOT%{_libdir}/libxkutil.so
> >  mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
> > -echo %{_libdir}/cmpi > $RPM_BUILD_ROOT/etc/ld.so.conf.d/libvirt-cim.conf
> > +echo %{_libdir}/cmpi > $RPM_BUILD_ROOT/etc/ld.so.conf.d/libvirt-cim.%{_arch}.conf
> >  mkdir -p $RPM_BUILD_ROOT at INFO_STORE@
> > 
> >  %clean
> > @@ -135,7 +135,7 @@ rm -fr $RPM_BUILD_ROOT
> >  %{_datadir}/libvirt-cim/cimv*-cimv2_mof
> >  %{_datadir}/libvirt-cim/*.registration
> >  %{_datadir}/libvirt-cim/cim_schema_*-MOFs.zip
> > -%{_sysconfdir}/ld.so.conf.d/libvirt-cim.conf
> > +%{_sysconfdir}/ld.so.conf.d/libvirt-cim.%{_arch}.conf
> >  %config(noreplace) %{_sysconfdir}/libvirt-cim.conf
> > 
> >  %changelog
> > 
> 
> +1. But s/23/32 before pushing.

  sure, thanks !
I assume someone from your team is pushing, right ?

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/