commit: d16897964aed980a2bf5b0a173a459a0db295922 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Aug 22 20:00:18 2020 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Aug 22 20:00:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1689796
app-emulation/gallium-nine-standalone: Set pkg-config LIBDIR I'm still not sure exactly why this has broken now but thanks to Michael Cook for the fix. Closes: https://bugs.gentoo.org/730542 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../files/0.7-cross-files.patch | 34 ++++++++++++++++++++++ .../gallium-nine-standalone-9999.ebuild | 5 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch new file mode 100644 index 00000000000..fed5c040368 --- /dev/null +++ b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch @@ -0,0 +1,34 @@ +diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in +index bfbe410..0064cf8 100644 +--- a/tools/cross-wine32.in ++++ b/tools/cross-wine32.in +@@ -5,9 +5,10 @@ strip = 'strip' + pkgconfig = '@PKG_CONFIG@' + + [properties] +-c_args = ['-m32'] +-c_link_args = ['-m32', '-mwindows'] ++c_args = @CFLAGS@ + ['-m32'] ++c_link_args = @LDFLAGS@ + ['-m32', '-mwindows'] + needs_exe_wrapper = true ++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@' + + [host_machine] + system = 'linux' +diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in +index 5e19023..06b1f2a 100644 +--- a/tools/cross-wine64.in ++++ b/tools/cross-wine64.in +@@ -5,9 +5,10 @@ strip = 'strip' + pkgconfig = '@PKG_CONFIG@' + + [properties] +-c_args = ['-m64'] +-c_link_args = ['-m64', '-mwindows'] ++c_args = @CFLAGS@ + ['-m64'] ++c_link_args = @LDFLAGS@ + ['-m64', '-mwindows'] + needs_exe_wrapper = true ++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@' + + [host_machine] + system = 'linux' diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild index 1cede2d1420..3e96326a2fc 100644 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,7 +38,7 @@ DEPEND=" " PATCHES=( - "${FILESDIR}"/0.5-flags.patch + "${FILESDIR}"/0.7-cross-files.patch "${FILESDIR}"/0.3-nine-dll-path.patch ) @@ -67,6 +67,7 @@ src_prepare() { -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ + -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \ ${file}.in > ${file} || die }
