Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: williamh@g.o, chewi@g.o, Mike Gilbert <floppym@g.o>
Subject: [gentoo-dev] [PATCH 3/3] app-emulation/gallium-nine-standalone: use meson-array
Date: Fri, 11 Dec 2020 23:18:52
Message-Id: 20201211231744.1078574-3-floppym@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/3] dev-util/meson: install meson-array script by Mike Gilbert
1 Bug: https://bugs.gentoo.org/759433
2 Signed-off-by: Mike Gilbert <floppym@g.o>
3 ---
4 .../gallium-nine-standalone-0.7.ebuild | 4 ++--
5 .../gallium-nine-standalone-9999.ebuild | 4 ++--
6 2 files changed, 4 insertions(+), 4 deletions(-)
7
8 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
9 index 3e96326a2fc8..9e075e1f5edb 100644
10 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
11 +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
12 @@ -65,8 +65,8 @@ src_prepare() {
13
14 sed \
15 -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
16 - -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
17 - -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
18 + -e "s!@CFLAGS@!$(meson-array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
19 + -e "s!@LDFLAGS@!$(meson-array "${LDFLAGS}")!" \
20 -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
21 ${file}.in > ${file} || die
22 }
23 diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
24 index 3e96326a2fc8..9e075e1f5edb 100644
25 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
26 +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
27 @@ -65,8 +65,8 @@ src_prepare() {
28
29 sed \
30 -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
31 - -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
32 - -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
33 + -e "s!@CFLAGS@!$(meson-array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
34 + -e "s!@LDFLAGS@!$(meson-array "${LDFLAGS}")!" \
35 -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
36 ${file}.in > ${file} || die
37 }
38 --
39 2.29.2

Replies