[PATCH] configure: do not include ${prefix} in firmwarepath

Paolo Bonzini posted 1 patch 3 years, 8 months ago
Failed in applying to current master (apply log)
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] configure: do not include ${prefix} in firmwarepath
Posted by Paolo Bonzini 3 years, 8 months ago
Left out in commit 22a87800e6 ("configure: expand path variables for
meson configure", 2020-08-21), do it now.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 56ceca2f68..d15ecbee46 100755
--- a/configure
+++ b/configure
@@ -473,7 +473,6 @@ LDFLAGS_SHARED="-shared"
 modules="no"
 module_upgrades="no"
 prefix="/usr/local"
-firmwarepath="\${prefix}/share/qemu-firmware"
 qemu_suffix="qemu"
 slirp=""
 oss_lib=""
@@ -1672,6 +1671,7 @@ for opt do
   esac
 done
 
+firmwarepath="${firmwarepath:-$prefix/share/qemu-firmware}"
 libdir="${libdir:-$prefix/lib}"
 libexecdir="${libexecdir:-$prefix/libexec}"
 includedir="${includedir:-$prefix/include}"
-- 
2.26.2


Re: [PATCH] configure: do not include ${prefix} in firmwarepath
Posted by Marc-André Lureau 3 years, 8 months ago
On Mon, Aug 31, 2020 at 12:50 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> Left out in commit 22a87800e6 ("configure: expand path variables for
> meson configure", 2020-08-21), do it now.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

lgtm

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 56ceca2f68..d15ecbee46 100755
> --- a/configure
> +++ b/configure
> @@ -473,7 +473,6 @@ LDFLAGS_SHARED="-shared"
>  modules="no"
>  module_upgrades="no"
>  prefix="/usr/local"
> -firmwarepath="\${prefix}/share/qemu-firmware"
>  qemu_suffix="qemu"
>  slirp=""
>  oss_lib=""
> @@ -1672,6 +1671,7 @@ for opt do
>    esac
>  done
>
> +firmwarepath="${firmwarepath:-$prefix/share/qemu-firmware}"
>  libdir="${libdir:-$prefix/lib}"
>  libexecdir="${libexecdir:-$prefix/libexec}"
>  includedir="${includedir:-$prefix/include}"
> --
> 2.26.2
>
>
>

-- 
Marc-André Lureau