[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: [OE-core] [PATCH 4/6] meson: add a patch to correct gtk-doc traceback
From: Alexander Kanavin <alex.kanavin () gmail ! com>
Date: 2019-06-28 13:24:55
Message-ID: 20190628132457.39465-4-alex.kanavin () gmail ! com
[Download RAW message or body]
Somehow upstream missed the needed change in a stable release.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/meson/meson.inc | 1 +
...ly-pick-the-compiler-for-gtk-doc-bui.patch | 30 +++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 meta/recipes-devtools/meson/meson/0001-gnome.py-correctly-pick-the-compiler-for-gtk-doc-bui.patch
diff --git a/meta/recipes-devtools/meson/meson.inc \
b/meta/recipes-devtools/meson/meson.inc index 943dd512086..694b7aa4e69 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -14,6 +14,7 @@ SRC_URI = \
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
+ file://0001-gnome.py-correctly-pick-the-compiler-for-gtk-doc-bui.patch \
"
SRC_URI[sha256sum] = \
"2f75fdf6d586d3595c03a07afcd0eaae11f68dd33fea5906a434d22a409ed63f" SRC_URI[md5sum] = \
"a091995861e0bc23e3c856b0c8d1ef90"
diff --git a/meta/recipes-devtools/meson/meson/0001-gnome.py-correctly-pick-the-compiler-for-gtk-doc-bui.patch \
b/meta/recipes-devtools/meson/meson/0001-gnome.py-correctly-pick-the-compiler-for-gtk-doc-bui.patch
new file mode 100644
index 00000000000..06cf132d07d
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/0001-gnome.py-correctly-pick-the-compiler-for-gtk-doc-bui.patch
@@ -0,0 +1,30 @@
+From 5d5d16f7726d8de301d9dac04538276854c8bf56 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 27 Jun 2019 17:19:14 +0200
+Subject: [PATCH] gnome.py: correctly pick the compiler for gtk-doc builds
+
+Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/5566]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ mesonbuild/modules/gnome.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index fd9e063e..aa815c7e 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -1045,10 +1045,7 @@ This will become a hard error in the future.''')
+
+ cflags.extend(state.environment.coredata.get_external_args(MachineChoice.HOST, \
'c')) + ldflags.extend(state.environment.coredata.get_external_link_args(MachineChoice.HOST, \
'c')) +- if state.environment.is_cross_build():
+- compiler = state.environment.coredata.cross_compilers.get('c')
+- else:
+- compiler = state.environment.coredata.compilers.host.get('c')
++ compiler = state.environment.coredata.compilers[MachineChoice.HOST]['c']
+
+ compiler_flags = self._get_langs_compilers_flags(state, [('c', compiler)])
+ cflags.extend(compiler_flags[0])
+--
+2.17.1
+
--
2.17.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic