1 |
On Fri, Dec 11, 2020 at 06:17:44PM -0500, Mike Gilbert wrote: |
2 |
> Bug: https://bugs.gentoo.org/759433 |
3 |
> Signed-off-by: Mike Gilbert <floppym@g.o> |
4 |
> --- |
5 |
> .../gallium-nine-standalone-0.7.ebuild | 4 ++-- |
6 |
> .../gallium-nine-standalone-9999.ebuild | 4 ++-- |
7 |
> 2 files changed, 4 insertions(+), 4 deletions(-) |
8 |
> |
9 |
> diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild |
10 |
> index 3e96326a2fc8..9e075e1f5edb 100644 |
11 |
> --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild |
12 |
> +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild |
13 |
> @@ -65,8 +65,8 @@ src_prepare() { |
14 |
> |
15 |
> sed \ |
16 |
> -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ |
17 |
> - -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ |
18 |
> - -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ |
19 |
> + -e "s!@CFLAGS@!$(meson-array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ |
20 |
> + -e "s!@LDFLAGS@!$(meson-array "${LDFLAGS}")!" \ |
21 |
> -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \ |
22 |
> ${file}.in > ${file} || die |
23 |
> } |
24 |
> diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild |
25 |
> index 3e96326a2fc8..9e075e1f5edb 100644 |
26 |
> --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild |
27 |
> +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild |
28 |
> @@ -65,8 +65,8 @@ src_prepare() { |
29 |
> |
30 |
> sed \ |
31 |
> -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ |
32 |
> - -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ |
33 |
> - -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ |
34 |
> + -e "s!@CFLAGS@!$(meson-array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ |
35 |
> + -e "s!@LDFLAGS@!$(meson-array "${LDFLAGS}")!" \ |
36 |
> -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \ |
37 |
> ${file}.in > ${file} || die |
38 |
> } |
39 |
> -- |
40 |
> 2.29.2 |
41 |
|
42 |
# @FUNCTION: _meson_env_array |
43 |
# @INTERNAL |
44 |
# @DESCRIPTION: |
45 |
# Parses the command line flags and converts them into an array suitable for |
46 |
# use in a cross file. |
47 |
|
48 |
The _meson_env_array function is not part of the API for the meson |
49 |
eclass. |
50 |
|
51 |
Can you tell me more about gallium-nine-standalone and what it needs |
52 |
from the meson eclass? We can probably provide functions that return the |
53 |
info it needs. |
54 |
|
55 |
Thanks, |
56 |
|
57 |
William |