summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2020-08-22 21:00:18 +0100
committerJames Le Cuirot <chewi@gentoo.org>2020-08-22 21:00:18 +0100
commitd16897964aed980a2bf5b0a173a459a0db295922 (patch)
treedeeee97e1bc9d9403c573414de1dcb0b206d353d /app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
parentwww-apps/nikola: fix wording (diff)
downloadgentoo-d16897964aed980a2bf5b0a173a459a0db295922.tar.gz
gentoo-d16897964aed980a2bf5b0a173a459a0db295922.tar.bz2
gentoo-d16897964aed980a2bf5b0a173a459a0db295922.zip
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@gentoo.org>
Diffstat (limited to 'app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch')
-rw-r--r--app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch34
1 files changed, 34 insertions, 0 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 000000000000..fed5c0403688
--- /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'