mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 09:32:14 +02:00
meson: add a recipe and class from meta-oe
The original recipe has been provided and improved by: Ross Burton <ross.burton@intel.com> Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Adam C. Foltzer <acfoltzer@galois.com> Peter Kjellerstedt <peter.kjellerstedt@axis.com> Linus Svensson <linussn@axis.com> I have added patches to fix up gtk-doc and gobject-introspection in cross-compilation environments, and also change the order of linker arguments to replicate autotools more closely (and fix linking errors in some corner cases). (From OE-Core rev: 1f8dea686cdfd6d360ba4a97f62d274c39eaeb8e) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
f2b03953b2
commit
0d2020fcff
@@ -0,0 +1,30 @@
|
||||
From 4676224dbdff0f7107e8cbdbe0eab19c855f1454 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 17 Nov 2017 13:18:28 +0200
|
||||
Subject: [PATCH] Linker rules: move {cross_args} in front of {output_args}
|
||||
|
||||
The previous order was found to break linking in some cases
|
||||
(e.g. when -no-pic -fno-PIC was present in {cross_args}.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
mesonbuild/backend/ninjabackend.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
|
||||
index bb281e1..969b70e 100644
|
||||
--- a/mesonbuild/backend/ninjabackend.py
|
||||
+++ b/mesonbuild/backend/ninjabackend.py
|
||||
@@ -1501,7 +1501,7 @@ int dummy;
|
||||
rspfile_content = $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing
|
||||
'''
|
||||
else:
|
||||
- command_template = ' command = {executable} $ARGS {output_args} $in $LINK_ARGS {cross_args} $aliasing\n'
|
||||
+ command_template = ' command = {executable} $ARGS {cross_args} {output_args} $in $LINK_ARGS $aliasing\n'
|
||||
command = command_template.format(
|
||||
executable=' '.join(compiler.get_linker_exelist()),
|
||||
cross_args=' '.join(cross_args),
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
From c5692cac9c555664281377a82bf8b1e46934f437 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 4 Aug 2017 16:16:41 +0300
|
||||
Subject: [PATCH 1/3] gtkdoc: fix issues that arise when cross-compiling
|
||||
|
||||
Specifically:
|
||||
1) Make it possible to specify a wrapper for executing binaries
|
||||
(usually, some kind of target hardware emulator, such as qemu)
|
||||
2) Explicitly provide CC and LD via command line, as otherwise gtk-doc will
|
||||
try to guess them, incorrectly.
|
||||
3) If things break down, print the full command with arguments,
|
||||
not just the binary name.
|
||||
4) Correctly determine the compiler/linker executables and cross-options when cross-compiling
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
mesonbuild/modules/gnome.py | 18 +++++++++++++++---
|
||||
mesonbuild/scripts/gtkdochelper.py | 9 +++++++--
|
||||
2 files changed, 22 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
||||
index 56765a5..4f7fe30 100644
|
||||
--- a/mesonbuild/modules/gnome.py
|
||||
+++ b/mesonbuild/modules/gnome.py
|
||||
@@ -769,6 +769,10 @@ This will become a hard error in the future.''')
|
||||
'--mode=' + mode]
|
||||
if namespace:
|
||||
args.append('--namespace=' + namespace)
|
||||
+ gtkdoc_exe_wrapper = state.environment.cross_info.config["properties"].get('gtkdoc_exe_wrapper', None)
|
||||
+ if gtkdoc_exe_wrapper is not None:
|
||||
+ args.append('--gtkdoc-exe-wrapper=' + gtkdoc_exe_wrapper)
|
||||
+
|
||||
args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
|
||||
args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
|
||||
args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs)
|
||||
@@ -796,14 +800,22 @@ This will become a hard error in the future.''')
|
||||
raise MesonException(
|
||||
'Gir include dirs should be include_directories().')
|
||||
cflags.update(get_include_args(inc_dirs))
|
||||
+
|
||||
+ cross_c_args = " ".join(state.environment.cross_info.config["properties"].get('c_args', ""))
|
||||
+ cross_link_args = " ".join(state.environment.cross_info.config["properties"].get('c_link_args', ""))
|
||||
+
|
||||
if cflags:
|
||||
- args += ['--cflags=%s' % ' '.join(cflags)]
|
||||
+ args += ['--cflags=%s %s' % (cross_c_args,' '.join(cflags))]
|
||||
if ldflags:
|
||||
- args += ['--ldflags=%s' % ' '.join(ldflags)]
|
||||
+ args += ['--ldflags=%s %s' % (cross_link_args, ' '.join(ldflags))]
|
||||
compiler = state.environment.coredata.compilers.get('c')
|
||||
- if compiler:
|
||||
+ cross_compiler = state.environment.coredata.cross_compilers.get('c')
|
||||
+ if compiler and not state.environment.is_cross_build():
|
||||
args += ['--cc=%s' % ' '.join(compiler.get_exelist())]
|
||||
args += ['--ld=%s' % ' '.join(compiler.get_linker_exelist())]
|
||||
+ elif cross_compiler and state.environment.is_cross_build():
|
||||
+ args += ['--cc=%s' % ' '.join(cross_compiler.get_exelist())]
|
||||
+ args += ['--ld=%s' % ' '.join(cross_compiler.get_linker_exelist())]
|
||||
|
||||
return args
|
||||
|
||||
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py
|
||||
index 4406b28..b846827 100644
|
||||
--- a/mesonbuild/scripts/gtkdochelper.py
|
||||
+++ b/mesonbuild/scripts/gtkdochelper.py
|
||||
@@ -44,13 +44,14 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='')
|
||||
parser.add_argument('--namespace', dest='namespace', default='')
|
||||
parser.add_argument('--mode', dest='mode', default='')
|
||||
parser.add_argument('--installdir', dest='install_dir')
|
||||
+parser.add_argument('--gtkdoc-exe-wrapper', dest='gtkdoc_exe_wrapper')
|
||||
|
||||
def gtkdoc_run_check(cmd, cwd):
|
||||
# Put stderr into stdout since we want to print it out anyway.
|
||||
# This preserves the order of messages.
|
||||
p, out = Popen_safe(cmd, cwd=cwd, stderr=subprocess.STDOUT)[0:2]
|
||||
if p.returncode != 0:
|
||||
- err_msg = ["{!r} failed with status {:d}".format(cmd[0], p.returncode)]
|
||||
+ err_msg = ["{!r} failed with status {:d}".format(cmd, p.returncode)]
|
||||
if out:
|
||||
err_msg.append(out)
|
||||
raise MesonException('\n'.join(err_msg))
|
||||
@@ -58,7 +59,7 @@ def gtkdoc_run_check(cmd, cwd):
|
||||
def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs,
|
||||
main_file, module,
|
||||
html_args, scan_args, fixxref_args, mkdb_args,
|
||||
- gobject_typesfile, scanobjs_args, ld, cc, ldflags, cflags,
|
||||
+ gobject_typesfile, scanobjs_args, gtkdoc_exe_wrapper, ld, cc, ldflags, cflags,
|
||||
html_assets, content_files, ignore_headers, namespace,
|
||||
expand_content_files, mode):
|
||||
print("Building documentation for %s" % module)
|
||||
@@ -111,6 +112,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs,
|
||||
if gobject_typesfile:
|
||||
scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile,
|
||||
'--module=' + module,
|
||||
+ '--run=' + gtkdoc_exe_wrapper,
|
||||
+ '--cc=' + cc,
|
||||
+ '--ld=' + ld,
|
||||
'--cflags=' + cflags,
|
||||
'--ldflags=' + ldflags,
|
||||
'--ld=' + ld]
|
||||
@@ -207,6 +211,7 @@ def run(args):
|
||||
mkdbargs,
|
||||
options.gobject_typesfile,
|
||||
scanobjsargs,
|
||||
+ options.gtkdoc_exe_wrapper,
|
||||
options.ld,
|
||||
options.cc,
|
||||
options.ldflags,
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From 972667e0d789a6969a5d79249404f3539f891810 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 4 Aug 2017 16:18:47 +0300
|
||||
Subject: [PATCH 1/2] gobject-introspection: determine g-ir-scanner and
|
||||
g-ir-compiler paths from pkgconfig
|
||||
|
||||
Do not hardcode the name of those binaries; gobject-introspection
|
||||
provides them via pkgconfig, and they can be set to something else
|
||||
(for example when cross-compiling).
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
mesonbuild/modules/gnome.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
||||
index 4f7fe30..9610cf6 100644
|
||||
--- a/mesonbuild/modules/gnome.py
|
||||
+++ b/mesonbuild/modules/gnome.py
|
||||
@@ -390,8 +390,6 @@ class GnomeModule(ExtensionModule):
|
||||
raise MesonException('Gir takes one argument')
|
||||
if kwargs.get('install_dir'):
|
||||
raise MesonException('install_dir is not supported with generate_gir(), see "install_dir_gir" and "install_dir_typelib"')
|
||||
- giscanner = find_program('g-ir-scanner', 'Gir')
|
||||
- gicompiler = find_program('g-ir-compiler', 'Gir')
|
||||
girtarget = args[0]
|
||||
while hasattr(girtarget, 'held_object'):
|
||||
girtarget = girtarget.held_object
|
||||
@@ -402,6 +400,8 @@ class GnomeModule(ExtensionModule):
|
||||
self.gir_dep = PkgConfigDependency('gobject-introspection-1.0',
|
||||
state.environment,
|
||||
{'native': True})
|
||||
+ giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
|
||||
+ gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
|
||||
pkgargs = self.gir_dep.get_compile_args()
|
||||
except Exception:
|
||||
raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.')
|
||||
--
|
||||
2.15.0
|
||||
|
||||
20
meta/recipes-devtools/meson/meson_0.44.0.bb
Normal file
20
meta/recipes-devtools/meson/meson_0.44.0.bb
Normal file
@@ -0,0 +1,20 @@
|
||||
HOMEPAGE = "http://mesonbuild.com"
|
||||
SUMMARY = "A high performance build system"
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||
|
||||
SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/${BP}.tar.gz \
|
||||
file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \
|
||||
file://0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch \
|
||||
file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "26a7ca93ec9cea5facb365664261f9c6"
|
||||
SRC_URI[sha256sum] = "50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b"
|
||||
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
|
||||
|
||||
inherit setuptools3
|
||||
|
||||
RDEPENDS_${PN} = "ninja python3-core python3-modules"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
Reference in New Issue
Block a user