spec: fix vpath build on RHEL 7

[libvirt] [PATCH] spec: fix vpath build on RHEL 7

Pavel Hrdina posted 1 patch 4 years, 5 months ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/190f6132557e3cccaf4d84fe8d4baee637e8c86f.1573482253.git.phrdina@redhat.com

libvirt.spec.in | 5 +++++
1 file changed, 5 insertions(+)

Expand all Fold all

[libvirt] [PATCH] spec: fix vpath build on RHEL 7

Posted by Pavel Hrdina 4 years, 5 months ago

Macro _vpath_builddir is not defined so we have to define it ourselves.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 libvirt.spec.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index eb8b2df055..2374668722 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -36,6 +36,11 @@
     %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x
 %endif
 
+# On RHEL 7 and older macro _vpath_builddir is not defined.
+%if 0%{?rhel} <= 7
+    %define _vpath_builddir %{_target_platform}
+%endif
+
 %ifarch %{qemu_kvm_arches}
     %define with_qemu_kvm      %{with_qemu}
 %else
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] spec: fix vpath build on RHEL 7

Posted by Daniel P. Berrangé 4 years, 5 months ago

On Mon, Nov 11, 2019 at 03:24:33PM +0100, Pavel Hrdina wrote:
> Macro _vpath_builddir is not defined so we have to define it ourselves.
> 
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
>  libvirt.spec.in | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index eb8b2df055..2374668722 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -36,6 +36,11 @@
>      %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x
>  %endif
>  
> +# On RHEL 7 and older macro _vpath_builddir is not defined.
> +%if 0%{?rhel} <= 7
> +    %define _vpath_builddir %{_target_platform}
> +%endif
> +
>  %ifarch %{qemu_kvm_arches}
>      %define with_qemu_kvm      %{with_qemu}
>  %else

If you've not already pushed as a build fix...

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


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 :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list