On Thu, Dec 08, 2011 at 01:27:37PM +0000, Daniel P. Berrange wrote:
> On Thu, Dec 08, 2011 at 01:04:27PM +0000, Daniel P. Berrange wrote:
> > On Tue, Dec 06, 2011 at 04:47:27PM -0700, Eric Blake wrote:
> > > Over time, Fedora and RHEL RPMs have often backported upstream
> > > patches that touched configure.ac and/or Makefile.am; this
> > > necessitates rerunning the autotools for the patch to be effective.
> > > Making this a one-liner spec tweak will make it easier for future
> > > backports to pull patches without having to find all the places
> > > to touch to properly use the autotools. Meanwhile, there have been
> > > historical instances where an update in the autotools caused FTBFS
> > > situations, so this is not on by default.
> > >
> > > * libvirt.spec.in (BuildRequires): Add autotools.
> > > (%build): Conditionally use them before configure.
> > > ---
> > >
> > > v2: switch default value of %enable_autotools
> > >
> > > libvirt.spec.in | 13 +++++++++++++
> > > 1 files changed, 13 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/libvirt.spec.in b/libvirt.spec.in
> > > index 97b811d..c2c926d 100644
> > > --- a/libvirt.spec.in
> > > +++ b/libvirt.spec.in
> > > @@ -8,6 +8,11 @@
> > > sed -ne 's/^\.fc\?\([0-9]\+\).*/%%define fedora \1/p')}
> > > %endif
> > >
> > > +# Default to skipping autoreconf. Distros can change just this one line
> > > +# (or provide a command-line override) if they backport any patches that
> > > +# touch configure.ac or Makefile.am.
> > > +%{?enable_autotools:%define enable_autotools 0}
>
> I've just tried this and it doesn't actually work. You need
>
> %define enable_autotools %{?enable_autotools:0}
>
There also needs to be a
BuildRequires: gettext-devel
since autoreconf runs autopoint which isn't in the build root
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list