| 1 |
commit: ca383d856dd617ceeee4bb6fe9ef93c98ccf55ab |
| 2 |
Author: Gerhard Bräunlich <g.braeunlich <AT> disroot <DOT> org> |
| 3 |
AuthorDate: Sat Jun 1 14:27:47 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 3 14:44:20 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca383d85 |
| 7 |
|
| 8 |
meson.eclass: fix cross compile file for mingw |
| 9 |
|
| 10 |
This is necessary for cross compiling for example x11-libs/gdk-pixbuf |
| 11 |
|
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/12168 |
| 13 |
Signed-off-by: Gerhard Bräunlich <g.braeunlich <AT> disroot.org> |
| 14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 15 |
|
| 16 |
eclass/meson.eclass | 3 ++- |
| 17 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 20 |
index b9562376b86..7c62cf44f78 100644 |
| 21 |
--- a/eclass/meson.eclass |
| 22 |
+++ b/eclass/meson.eclass |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 2017-2018 Gentoo Authors |
| 25 |
+# Copyright 2017-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
# @ECLASS: meson.eclass |
| 29 |
@@ -160,6 +160,7 @@ _meson_create_cross_file() { |
| 30 |
objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") |
| 31 |
pkgconfig = '$(tc-getPKG_CONFIG)' |
| 32 |
strip = $(_meson_env_array "$(tc-getSTRIP)") |
| 33 |
+ windres = $(_meson_env_array "$(tc-getRC)") |
| 34 |
|
| 35 |
[properties] |
| 36 |
c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") |
Archives