Re: [Mesa-dev] [PATCH 1/2] meson: Be a bit more helpful when arch or OS is unknown
Quoting Guido Günther (2018-08-27 09:32:54)
> Hi,
> On Mon, Aug 27, 2018 at 09:23:44AM -0700, Dylan Baker wrote:
> > Quoting Guido Günther (2018-08-26 13:23:59)
> > > V2: Add one missing @0@
> > >
> > > Signed-off-by: Guido Günther
> > > ---
> > > meson.build | 21 ++---
> > > 1 file changed, 14 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/meson.build b/meson.build
> > > index 1b3dfa221c9..c3a7e8cdd74 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -102,13 +102,15 @@ if _drivers.contains('auto')
> > > elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
> > >_drivers = []
> > > else
> > > - error('Unknown architecture. Please pass -Ddri-drivers to set
> > > driver options. Patches gladly accepted to fix this.')
> > > + error('Unknown architecture @0@. Please pass -Ddri-drivers to set
> > > driver options. Patches gladly accepted to fix this.'.format(
> > > +host_machine.cpu_family()))
> > > endif
> > >elif ['darwin', 'windows', 'cygwin',
> > > 'haiku'].contains(host_machine.system())
> > > # only swrast would make sense here, but gallium swrast is a much
> > > better default
> > > _drivers = []
> > >else
> > > -error('Unknown OS. Please pass -Ddri-drivers to set driver options.
> > > Patches gladly accepted to fix this.')
> > > +error('Unknown OS @0@. Please pass -Ddri-drivers to set driver
> > > options. Patches gladly accepted to fix this.'.format(
> > > + host_machine.system()))
> > >endif
> > > endif
> > >
> > > @@ -135,12 +137,14 @@ if _drivers.contains('auto')
> > > 'tegra', 'virgl', 'swrast',
> > >]
> > > else
> > > - error('Unknown architecture. Please pass -Dgallium-drivers to set
> > > driver options. Patches gladly accepted to fix this.')
> > > + error('Unknown architecture @0@. Please pass -Dgallium-drivers to
> > > set driver options. Patches gladly accepted to fix this.'.format(
> > > +host_machine.cpu_family()))
> > > endif
> > >elif ['darwin', 'windows', 'cygwin',
> > > 'haiku'].contains(host_machine.system())
> > > _drivers = ['swrast']
> > >else
> > > -error('Unknown OS. Please pass -Dgallium-drivers to set driver
> > > options. Patches gladly accepted to fix this.')
> > > +error('Unknown OS @0@. Please pass -Dgallium-drivers to set driver
> > > options. Patches gladly accepted to fix this.'.format(
> > > + host_machine.system()))
> > >endif
> > > endif
> > > with_gallium_pl111 = _drivers.contains('pl111')
> > > @@ -176,13 +180,15 @@ if _vulkan_drivers.contains('auto')
> > > if host_machine.cpu_family().startswith('x86')
> > >_vulkan_drivers = ['amd', 'intel']
> > > else
> > > - error('Unknown architecture. Please pass -Dvulkan-drivers to set
> > > driver options. Patches gladly accepted to fix this.')
> > > + error('Unknown architecture @0@. Please pass -Dvulkan-drivers to
> > > set driver options. Patches gladly accepted to fix this.'.format(
> > > +host_machine.cpu_family()))
> > > endif
> > >elif ['darwin', 'windows', 'cygwin',
> > > 'haiku'].contains(host_machine.system())
> > > # No vulkan driver supports windows or macOS currently
> > > _vulkan_drivers = []
> > >else
> > > -error('Unknown OS. Please pass -Dvulkan-drivers to set driver
> > > options. Patches gladly accepted to fix this.')
> > > +error('Unknown OS @0@. Please pass -Dvulkan-drivers to set driver
> > > options. Patches gladly accepted to fix this.'.format(
> > > + host_machine.system()))
> > >endif
> > > endif
> > >
> > > @@ -230,7 +236,8 @@ if _platforms.contains('auto')
> > >elif ['haiku'].contains(host_machine.system())
> > > _platforms = ['haiku']
> > >else
> > > -error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
> > > gladly accepted to fix this.')
> > > +error('Unknown OS @0@. Please pass -Dplatforms to set platforms.
> > > Patches gladly accepted to fix this.'.format(
> > > + host_machine.system()))
> > >endif
> > > endif
> > >
> > > --
> > > 2.18.0
> > >
> >
> > for the series,
> > Reviewed-by: Dylan Baker
>
> Thanks!
>
> >
> > Do you need me to push these for you?
>
> Yes, please.
> -- Guido
>
Pushed. Thanks for this!
signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] meson: Be a bit more helpful when arch or OS is unknown
Hi,
On Mon, Aug 27, 2018 at 09:23:44AM -0700, Dylan Baker wrote:
> Quoting Guido Günther (2018-08-26 13:23:59)
> > V2: Add one missing @0@
> >
> > Signed-off-by: Guido Günther
> > ---
> > meson.build | 21 ++---
> > 1 file changed, 14 insertions(+), 7 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 1b3dfa221c9..c3a7e8cdd74 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -102,13 +102,15 @@ if _drivers.contains('auto')
> > elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
> >_drivers = []
> > else
> > - error('Unknown architecture. Please pass -Ddri-drivers to set driver
> > options. Patches gladly accepted to fix this.')
> > + error('Unknown architecture @0@. Please pass -Ddri-drivers to set
> > driver options. Patches gladly accepted to fix this.'.format(
> > +host_machine.cpu_family()))
> > endif
> >elif ['darwin', 'windows', 'cygwin',
> > 'haiku'].contains(host_machine.system())
> > # only swrast would make sense here, but gallium swrast is a much
> > better default
> > _drivers = []
> >else
> > -error('Unknown OS. Please pass -Ddri-drivers to set driver options.
> > Patches gladly accepted to fix this.')
> > +error('Unknown OS @0@. Please pass -Ddri-drivers to set driver
> > options. Patches gladly accepted to fix this.'.format(
> > + host_machine.system()))
> >endif
> > endif
> >
> > @@ -135,12 +137,14 @@ if _drivers.contains('auto')
> > 'tegra', 'virgl', 'swrast',
> >]
> > else
> > - error('Unknown architecture. Please pass -Dgallium-drivers to set
> > driver options. Patches gladly accepted to fix this.')
> > + error('Unknown architecture @0@. Please pass -Dgallium-drivers to
> > set driver options. Patches gladly accepted to fix this.'.format(
> > +host_machine.cpu_family()))
> > endif
> >elif ['darwin', 'windows', 'cygwin',
> > 'haiku'].contains(host_machine.system())
> > _drivers = ['swrast']
> >else
> > -error('Unknown OS. Please pass -Dgallium-drivers to set driver
> > options. Patches gladly accepted to fix this.')
> > +error('Unknown OS @0@. Please pass -Dgallium-drivers to set driver
> > options. Patches gladly accepted to fix this.'.format(
> > + host_machine.system()))
> >endif
> > endif
> > with_gallium_pl111 = _drivers.contains('pl111')
> > @@ -176,13 +180,15 @@ if _vulkan_drivers.contains('auto')
> > if host_machine.cpu_family().startswith('x86')
> >_vulkan_drivers = ['amd', 'intel']
> > else
> > - error('Unknown architecture. Please pass -Dvulkan-drivers to set
> > driver options. Patches gladly accepted to fix this.')
> > + error('Unknown architecture @0@. Please pass -Dvulkan-drivers to set
> > driver options. Patches gladly accepted to fix this.'.format(
> > +host_machine.cpu_family()))
> > endif
> >elif ['darwin', 'windows', 'cygwin',
> > 'haiku'].contains(host_machine.system())
> > # No vulkan driver supports windows or macOS currently
> > _vulkan_drivers = []
> >else
> > -error('Unknown OS. Please pass -Dvulkan-drivers to set driver options.
> > Patches gladly accepted to fix this.')
> > +error('Unknown OS @0@. Please pass -Dvulkan-drivers to set driver
> > options. Patches gladly accepted to fix this.'.format(
> > + host_machine.system()))
> >endif
> > endif
> >
> > @@ -230,7 +236,8 @@ if _platforms.contains('auto')
> >elif ['haiku'].contains(host_machine.system())
> > _platforms = ['haiku']
> >else
> > -error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
> > gladly accepted to fix this.')
> > +error('Unknown OS @0@. Please pass -Dplatforms to set platforms.
> > Patches gladly accepted to fix this.'.format(
> > + host_machine.system()))
> >endif
> > endif
> >
> > --
> > 2.18.0
> >
>
> for the series,
> Reviewed-by: Dylan Baker
Thanks!
>
> Do you need me to push these for you?
Yes, please.
-- Guido
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] meson: Be a bit more helpful when arch or OS is unknown
Quoting Guido Günther (2018-08-26 13:23:59)
> V2: Add one missing @0@
>
> Signed-off-by: Guido Günther
> ---
> meson.build | 21 ++---
> 1 file changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 1b3dfa221c9..c3a7e8cdd74 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -102,13 +102,15 @@ if _drivers.contains('auto')
> elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
>_drivers = []
> else
> - error('Unknown architecture. Please pass -Ddri-drivers to set driver
> options. Patches gladly accepted to fix this.')
> + error('Unknown architecture @0@. Please pass -Ddri-drivers to set
> driver options. Patches gladly accepted to fix this.'.format(
> +host_machine.cpu_family()))
> endif
>elif ['darwin', 'windows', 'cygwin',
> 'haiku'].contains(host_machine.system())
> # only swrast would make sense here, but gallium swrast is a much better
> default
> _drivers = []
>else
> -error('Unknown OS. Please pass -Ddri-drivers to set driver options.
> Patches gladly accepted to fix this.')
> +error('Unknown OS @0@. Please pass -Ddri-drivers to set driver options.
> Patches gladly accepted to fix this.'.format(
> + host_machine.system()))
>endif
> endif
>
> @@ -135,12 +137,14 @@ if _drivers.contains('auto')
> 'tegra', 'virgl', 'swrast',
>]
> else
> - error('Unknown architecture. Please pass -Dgallium-drivers to set
> driver options. Patches gladly accepted to fix this.')
> + error('Unknown architecture @0@. Please pass -Dgallium-drivers to set
> driver options. Patches gladly accepted to fix this.'.format(
> +host_machine.cpu_family()))
> endif
>elif ['darwin', 'windows', 'cygwin',
> 'haiku'].contains(host_machine.system())
> _drivers = ['swrast']
>else
> -error('Unknown OS. Please pass -Dgallium-drivers to set driver options.
> Patches gladly accepted to fix this.')
> +error('Unknown OS @0@. Please pass -Dgallium-drivers to set driver
> options. Patches gladly accepted to fix this.'.format(
> + host_machine.system()))
>endif
> endif
> with_gallium_pl111 = _drivers.contains('pl111')
> @@ -176,13 +180,15 @@ if _vulkan_drivers.contains('auto')
> if host_machine.cpu_family().startswith('x86')
>_vulkan_drivers = ['amd', 'intel']
> else
> - error('Unknown architecture. Please pass -Dvulkan-drivers to set
> driver options. Patches gladly accepted to fix this.')
> + error('Unknown architecture @0@. Please pass -Dvulkan-drivers to set
> driver options. Patches gladly accepted to fix this.'.format(
> +host_machine.cpu_family()))
> endif
>elif ['darwin', 'windows', 'cygwin',
> 'haiku'].contains(host_machine.system())
> # No vulkan driver supports windows or macOS currently
> _vulkan_drivers = []
>else
> -error('Unknown OS. Please pass -Dvulkan-drivers to set driver options.
> Patches gladly accepted to fix this.')
> +error('Unknown OS @0@. Please pass -Dvulkan-drivers to set driver
> options. Patches gladly accepted to fix this.'.format(
> + host_machine.system()))
>endif
> endif
>
> @@ -230,7 +236,8 @@ if _platforms.contains('auto')
>elif ['haiku'].contains(host_machine.system())
> _platforms = ['haiku']
>else
> -error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
> gladly accepted to fix this.')
> +error('Unknown OS @0@. Please pass -Dplatforms to set platforms. Patches
> gladly accepted to fix this.'.format(
> + host_machine.system()))
>endif
> endif
>
> --
> 2.18.0
>
for the series,
Reviewed-by: Dylan Baker
Do you need me to push these for you?
signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/2] meson: Be a bit more helpful when arch or OS is unknown
V2: Add one missing @0@
Signed-off-by: Guido Günther
---
meson.build | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 1b3dfa221c9..c3a7e8cdd74 100644
--- a/meson.build
+++ b/meson.build
@@ -102,13 +102,15 @@ if _drivers.contains('auto')
elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
_drivers = []
else
- error('Unknown architecture. Please pass -Ddri-drivers to set driver
options. Patches gladly accepted to fix this.')
+ error('Unknown architecture @0@. Please pass -Ddri-drivers to set driver
options. Patches gladly accepted to fix this.'.format(
+host_machine.cpu_family()))
endif
elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
# only swrast would make sense here, but gallium swrast is a much better
default
_drivers = []
else
-error('Unknown OS. Please pass -Ddri-drivers to set driver options.
Patches gladly accepted to fix this.')
+error('Unknown OS @0@. Please pass -Ddri-drivers to set driver options.
Patches gladly accepted to fix this.'.format(
+ host_machine.system()))
endif
endif
@@ -135,12 +137,14 @@ if _drivers.contains('auto')
'tegra', 'virgl', 'swrast',
]
else
- error('Unknown architecture. Please pass -Dgallium-drivers to set driver
options. Patches gladly accepted to fix this.')
+ error('Unknown architecture @0@. Please pass -Dgallium-drivers to set
driver options. Patches gladly accepted to fix this.'.format(
+host_machine.cpu_family()))
endif
elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
_drivers = ['swrast']
else
-error('Unknown OS. Please pass -Dgallium-drivers to set driver options.
Patches gladly accepted to fix this.')
+error('Unknown OS @0@. Please pass -Dgallium-drivers to set driver
options. Patches gladly accepted to fix this.'.format(
+ host_machine.system()))
endif
endif
with_gallium_pl111 = _drivers.contains('pl111')
@@ -176,13 +180,15 @@ if _vulkan_drivers.contains('auto')
if host_machine.cpu_family().startswith('x86')
_vulkan_drivers = ['amd', 'intel']
else
- error('Unknown architecture. Please pass -Dvulkan-drivers to set driver
options. Patches gladly accepted to fix this.')
+ error('Unknown architecture @0@. Please pass -Dvulkan-drivers to set
driver options. Patches gladly accepted to fix this.'.format(
+host_machine.cpu_family()))
endif
elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
# No vulkan driver supports windows or macOS currently
_vulkan_drivers = []
else
-error('Unknown OS. Please pass -Dvulkan-drivers to set driver options.
Patches gladly accepted to fix this.')
+error('Unknown OS @0@. Please pass -Dvulkan-drivers to set driver options.
Patches gladly accepted to fix this.'.format(
+ host_machine.system()))
endif
endif
@@ -230,7 +236,8 @@ if _platforms.contains('auto')
elif ['haiku'].contains(host_machine.system())
_platforms = ['haiku']
else
-error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
gladly accepted to fix this.')
+error('Unknown OS @0@. Please pass -Dplatforms to set platforms. Patches
gladly accepted to fix this.'.format(
+ host_machine.system()))
endif
endif
--
2.18.0
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] meson: Be a bit more helpful when arch or OS is unknown
Hi,
On Sat, Aug 25, 2018 at 05:18:33PM +1000, Stuart Young wrote:
>On Fri, 24 Aug 2018 at 22:23, Guido Günther <[1]a...@sigxcpu.org> wrote:
>
> @@ -230,7 +236,8 @@ if _platforms.contains('auto')
> elif ['haiku'].contains(host_machine.system())
> _platforms = ['haiku']
> else
> - error('Unknown OS. Please pass -Dplatforms to set platforms.
> Patches gladly accepted to fix this.')
> + error('Unknown OS. Please pass -Dplatforms to set platforms.
> Patches gladly accepted to fix this.'.format(
> + host_machine.system()))
> endif
> endif
>
>Did you mean that last "Unknown OS." to be "Unknown OS @0@." like all the
>others?
Thanks for catching this, I'll send out a fixed version.
-- Guido
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] meson: Be a bit more helpful when arch or OS is unknown
On Fri, 24 Aug 2018 at 22:23, Guido Günther wrote:
>
> @@ -230,7 +236,8 @@ if _platforms.contains('auto')
>elif ['haiku'].contains(host_machine.system())
> _platforms = ['haiku']
>else
> -error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
> gladly accepted to fix this.')
> +error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
> gladly accepted to fix this.'.format(
> + host_machine.system()))
>endif
> endif
>
Did you mean that last "Unknown OS." to be "Unknown OS @0@." like all the
others?
--
Stuart Young (aka Cefiar)
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/2] meson: Be a bit more helpful when arch or OS is unknown
Signed-off-by: Guido Günther
---
meson.build | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 1b3dfa221c9..ccc0ed6a0ea 100644
--- a/meson.build
+++ b/meson.build
@@ -102,13 +102,15 @@ if _drivers.contains('auto')
elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
_drivers = []
else
- error('Unknown architecture. Please pass -Ddri-drivers to set driver
options. Patches gladly accepted to fix this.')
+ error('Unknown architecture @0@. Please pass -Ddri-drivers to set driver
options. Patches gladly accepted to fix this.'.format(
+host_machine.cpu_family()))
endif
elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
# only swrast would make sense here, but gallium swrast is a much better
default
_drivers = []
else
-error('Unknown OS. Please pass -Ddri-drivers to set driver options.
Patches gladly accepted to fix this.')
+error('Unknown OS @0@. Please pass -Ddri-drivers to set driver options.
Patches gladly accepted to fix this.'.format(
+ host_machine.system()))
endif
endif
@@ -135,12 +137,14 @@ if _drivers.contains('auto')
'tegra', 'virgl', 'swrast',
]
else
- error('Unknown architecture. Please pass -Dgallium-drivers to set driver
options. Patches gladly accepted to fix this.')
+ error('Unknown architecture @0@. Please pass -Dgallium-drivers to set
driver options. Patches gladly accepted to fix this.'.format(
+host_machine.cpu_family()))
endif
elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
_drivers = ['swrast']
else
-error('Unknown OS. Please pass -Dgallium-drivers to set driver options.
Patches gladly accepted to fix this.')
+error('Unknown OS @0@. Please pass -Dgallium-drivers to set driver
options. Patches gladly accepted to fix this.'.format(
+ host_machine.system()))
endif
endif
with_gallium_pl111 = _drivers.contains('pl111')
@@ -176,13 +180,15 @@ if _vulkan_drivers.contains('auto')
if host_machine.cpu_family().startswith('x86')
_vulkan_drivers = ['amd', 'intel']
else
- error('Unknown architecture. Please pass -Dvulkan-drivers to set driver
options. Patches gladly accepted to fix this.')
+ error('Unknown architecture @0@. Please pass -Dvulkan-drivers to set
driver options. Patches gladly accepted to fix this.'.format(
+host_machine.cpu_family()))
endif
elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system())
# No vulkan driver supports windows or macOS currently
_vulkan_drivers = []
else
-error('Unknown OS. Please pass -Dvulkan-drivers to set driver options.
Patches gladly accepted to fix this.')
+error('Unknown OS @0@. Please pass -Dvulkan-drivers to set driver options.
Patches gladly accepted to fix this.'.format(
+ host_machine.system()))
endif
endif
@@ -230,7 +236,8 @@ if _platforms.contains('auto')
elif ['haiku'].contains(host_machine.system())
_platforms = ['haiku']
else
-error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
gladly accepted to fix this.')
+error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
gladly accepted to fix this.'.format(
+ host_machine.system()))
endif
endif
--
2.18.0
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
