[libvirt PATCH 2/2] rpm: tell meson whether to use libssh or libssh2 explicitly

[Daniel P. Berrangé]

On Wed, Oct 28, 2020 at 12:30:37PM +0000, Daniel P. Berrangé wrote:
> The %meson macro sets "--auto-features=enabled", thus any feature in the
> RPM which has a "with_XXX" condition, needs to explicitly pass a
> "-DXXX=state" arg to %meson to override the auto features setting.
> 
> The with_libssh and with_libssh2 conditions were not exposed to meson,
> so if either was set disabled, then meson would fail the build if the
> -devel packages were not found.
> 
> Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> ---
>  libvirt.spec.in | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 47fb53c681..8faa8c656f 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -1109,6 +1109,18 @@ exit 1
>      %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled
>  %endif
>  
> +%if %{with_libssh}
> +    %define arg_libssh -Dlibssh=enabled
> +%else
> +    %define arg_libssh -Dlibssh=disabled
> +%endif
> +
> +%if %{with_libssh2}
> +    %define arg_libssh2 -Dlibssh2=enabled
> +%else
> +    %define arg_libssh2 -Dlibssh2=disabled
> +%endif
> +
>  %define when  %(date +"%%F-%%T")
>  %define where %(hostname)
>  %define who   %{?packager}%{!?packager:Unknown}


Opps, failed to commit the second hunk. This is what I'll
squash in:


            -Dfirewalld=enabled \
            %{?arg_firewalld_zone} \
            %{?arg_wireshark} \
+           %{?arg_libssh} \
+           %{?arg_libssh2} \
            -Dpm_utils=disabled \
            -Dnss=enabled \
            %{arg_packager} \


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