From dbac12d5eacc945881d472dca492180b62e6f345 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 4 May 2018 15:32:42 +0300 Subject: meson: update to 0.46.0 Rebase a couple of patches Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...rospection-determine-g-ir-scanner-and-g-i.patch | 17 +++---- .../meson/meson/0003-native_bindir.patch | 57 ++++++++++++---------- meta/recipes-devtools/meson/meson_0.45.1.bb | 21 -------- meta/recipes-devtools/meson/meson_0.46.0.bb | 21 ++++++++ 4 files changed, 60 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson_0.45.1.bb create mode 100644 meta/recipes-devtools/meson/meson_0.46.0.bb (limited to 'meta') diff --git a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch index ded42d14f7..f32267d0c4 100644 --- a/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch +++ b/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch @@ -1,7 +1,7 @@ -From 972667e0d789a6969a5d79249404f3539f891810 Mon Sep 17 00:00:00 2001 +From 0b860cb8a22ae876b6088939dbabca216bc29431 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 4 Aug 2017 16:18:47 +0300 -Subject: [PATCH 1/2] gobject-introspection: determine g-ir-scanner and +Subject: [PATCH] gobject-introspection: determine g-ir-scanner and g-ir-compiler paths from pkgconfig Do not hardcode the name of those binaries; gobject-introspection @@ -16,19 +16,19 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 4f7fe30..9610cf6 100644 +index b29bab9..dc4c401 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -390,8 +390,6 @@ class GnomeModule(ExtensionModule): +@@ -393,8 +393,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') +- giscanner = self.interpreter.find_program_impl('g-ir-scanner') +- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') girtarget = args[0] while hasattr(girtarget, 'held_object'): girtarget = girtarget.held_object -@@ -402,6 +400,8 @@ class GnomeModule(ExtensionModule): +@@ -405,6 +403,8 @@ class GnomeModule(ExtensionModule): self.gir_dep = PkgConfigDependency('gobject-introspection-1.0', state.environment, {'native': True}) @@ -37,6 +37,3 @@ index 4f7fe30..9610cf6 100644 pkgargs = self.gir_dep.get_compile_args() except Exception: raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') --- -2.15.0 - diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index af5e6a190b..f00327714b 100644 --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,7 +1,7 @@ -From ffa72eac56558aa4171dd70ac1e9c27a07338fa2 Mon Sep 17 00:00:00 2001 +From 0eec9428376450917098c68539a6c9dd60b85d93 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 -Subject: [PATCH 4/4] native_bindir +Subject: [PATCH] native_bindir Some libraries, like QT, have pre-processors that convert their input files into something that the cross-compiler can process. We find the @@ -17,15 +17,15 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ricardo Ribalda Delgado --- - mesonbuild/dependencies/base.py | 16 ++++++++++------ + mesonbuild/dependencies/base.py | 19 +++++++++++-------- mesonbuild/dependencies/ui.py | 6 +++--- - 2 files changed, 13 insertions(+), 9 deletions(-) + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index bf79bc5..c9fd08c 100644 +index 0114a14..f4f19c5 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -131,7 +131,7 @@ class Dependency: +@@ -141,7 +141,7 @@ class Dependency: def need_threads(self): return False @@ -34,7 +34,7 @@ index bf79bc5..c9fd08c 100644 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) def get_configtool_variable(self, variable_name): -@@ -150,7 +150,7 @@ class InternalDependency(Dependency): +@@ -178,7 +178,7 @@ class InternalDependency(Dependency): self.sources = sources self.ext_deps = ext_deps @@ -43,24 +43,34 @@ index bf79bc5..c9fd08c 100644 raise DependencyException('Method "get_pkgconfig_variable()" is ' 'invalid for an internal dependency') -@@ -425,10 +425,14 @@ class PkgConfigDependency(ExternalDependency): +@@ -517,11 +517,14 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs) -- def _call_pkgbin(self, args, env=None): -+ def _call_pkgbin(self, args, env=None, use_native=False): - if not env: - env = os.environ -- p, out = Popen_safe([self.pkgbin] + args, env=env)[0:2] +- def _call_pkgbin_real(self, args, env): +- p, out = Popen_safe(self.pkgbin.get_command() + args, env=env)[0:2] ++ def _call_pkgbin_real(self, args, env, use_native=False): + if use_native: -+ pkgbin = [self.pkgbin + "-native"] ++ p, out = Popen_safe(self.pkgbin.get_command() + "-native" + args, env=env)[0:2] + else: -+ pkgbin = [self.pkgbin] -+ p, out = Popen_safe(pkgbin + args, env=env)[0:2] ++ p, out = Popen_safe(self.pkgbin.get_command() + args, env=env)[0:2] return p.returncode, out.strip() +- def _call_pkgbin(self, args, env=None): ++ def _call_pkgbin(self, args, env=None, use_native=False): + if env is None: + fenv = env + env = os.environ +@@ -530,7 +533,7 @@ class PkgConfigDependency(ExternalDependency): + targs = tuple(args) + cache = PkgConfigDependency.pkgbin_cache + if (self.pkgbin, targs, fenv) not in cache: +- cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env) ++ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) + return cache[(self.pkgbin, targs, fenv)] + def _convert_mingw_paths(self, args): -@@ -522,7 +526,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -630,7 +633,7 @@ class PkgConfigDependency(ExternalDependency): # linkers such as MSVC, so prepend them. self.link_args = ['-L' + lp for lp in libpaths] + self.link_args @@ -69,7 +79,7 @@ index bf79bc5..c9fd08c 100644 options = ['--variable=' + variable_name, self.name] if 'define_variable' in kwargs: -@@ -535,7 +539,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -643,7 +646,7 @@ class PkgConfigDependency(ExternalDependency): options = ['--define-variable=' + '='.join(definition)] + options @@ -79,10 +89,10 @@ index bf79bc5..c9fd08c 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 1db518c..4ed1d04 100644 +index 2f31196..916f648 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py -@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency): +@@ -240,7 +240,7 @@ class QtBaseDependency(ExternalDependency): self.bindir = self.get_pkgconfig_host_bins(core) if not self.bindir: # If exec_prefix is not defined, the pkg-config file is broken @@ -91,7 +101,7 @@ index 1db518c..4ed1d04 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -374,7 +374,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -100,7 +110,7 @@ index 1db518c..4ed1d04 100644 except MesonException: pass -@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -384,7 +384,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): @@ -109,6 +119,3 @@ index 1db518c..4ed1d04 100644 # There are three different ways of depending on SDL2: --- -2.15.1 - diff --git a/meta/recipes-devtools/meson/meson_0.45.1.bb b/meta/recipes-devtools/meson/meson_0.45.1.bb deleted file mode 100644 index 9decdd0c24..0000000000 --- a/meta/recipes-devtools/meson/meson_0.45.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -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 \ - file://0003-native_bindir.patch \ - " -SRC_URI[md5sum] = "4d9c7b3a7365b7b472f00af14e034949" -SRC_URI[sha256sum] = "4d0bb0dbb1bb556cb7a4092fdfea3d6e76606bd739a4bc97481c2d7bc6200afb" -UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" - -inherit setuptools3 - -RDEPENDS_${PN} = "ninja python3-core python3-modules" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/meson/meson_0.46.0.bb b/meta/recipes-devtools/meson/meson_0.46.0.bb new file mode 100644 index 0000000000..7334045e05 --- /dev/null +++ b/meta/recipes-devtools/meson/meson_0.46.0.bb @@ -0,0 +1,21 @@ +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 \ + file://0003-native_bindir.patch \ + " +SRC_URI[md5sum] = "e3301606017e364a0d7e1c3b755e7a28" +SRC_URI[sha256sum] = "b7df91b01a358a8facdbfa33596a47cda38a760435ab55e1985c0bff06a9cbf0" +UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" + +inherit setuptools3 + +RDEPENDS_${PN} = "ninja python3-core python3-modules" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg