On Tue, Oct 6, 2020 at 6:28 AM Andrea Bolognani <abologna@xxxxxxxxxx> wrote:
>
> On Mon, 2020-10-05 at 20:46 -0400, Neal Gompa wrote:
> > On Mon, Oct 5, 2020 at 2:41 PM Andrea Bolognani <abologna@xxxxxxxxxx> wrote:
> > > It belongs before package-specific feature flags are defined.
> > >
> > > Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
> > > ---
> > > libvirt.spec.in | 10 +++++-----
> > > 1 file changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/libvirt.spec.in b/libvirt.spec.in
> > > index 2401404008..d8f689e651 100644
> > > --- a/libvirt.spec.in
> > > +++ b/libvirt.spec.in
> > > @@ -12,6 +12,11 @@
> > > %define supported_platform 0
> > > %endif
> > >
> > > +# On RHEL 7 and older macro _vpath_builddir is not defined.
> > > +%if 0%{?rhel} && 0%{?rhel} <= 7
> > > + %define _vpath_builddir %{_target_platform}
> > > +%endif
> >
> > Do we still need this anymore? Meson in EPEL 7 works without this definition...
>
> We're installing Meson from PyPi instead of EPEL on CentOS as part of
> our CI setup, but indeed it looks like that's not necessary and we
> could simply use the EPEL package. I'll look into that.
>
> Anyway, at least on my Fedora machine _vpath_builddir is defined in
> /usr/lib/rpm/macros.d/macros.vpath, which is part of the
> redhat-rpm-config package, and the various %meson macros defined in
> /usr/lib/rpm/macros.d/macros.meson use it, so it doesn't look like
> even installing Meson from EPEL would remove the need to define that
> value? Note I haven't actually tried O:-)
>
In EPEL 7, the %_vpath_* macros are defined by epel-rpm-macros, which
are installed automatically into the build environment when you do a
package build. We could just have this installed in our CentOS 7 CI
environment.
--
真実はいつも一つ！/ Always, there's only one truth!
