Signed-off-by: Ricardo Ribalda Delgado <[email protected]> --- .../meson/meson/native_bindir.patch | 59 ++++++++++++++-------- .../meson/{meson_0.40.1.bb => meson_0.43.0.bb} | 2 +- 2 files changed, 39 insertions(+), 22 deletions(-) rename meta-oe/recipes-devtools/meson/{meson_0.40.1.bb => meson_0.43.0.bb} (88%)
diff --git a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch index 993e9750e33e..805c1f6a50dc 100644 --- a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch +++ b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch @@ -1,22 +1,32 @@ +From 01dd18c9c9c042268b87d576624c16fc74253cd9 Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado <[email protected]> +Date: Wed, 15 Nov 2017 15:05:01 +0100 +Subject: [PATCH] native_bindir + There are some discussions upstream to merge this patch, but I presonaly believe that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ricardo Ribalda Delgado <[email protected]> -diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py -index 04a22f985941..3e33bc4a79e7 100644 ---- a/mesonbuild/dependencies.py -+++ b/mesonbuild/dependencies.py -@@ -95,7 +95,7 @@ class Dependency: +--- + mesonbuild/dependencies/base.py | 14 +++++++++----- + mesonbuild/dependencies/ui.py | 6 +++--- + 2 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +index 0d9742d426cb..0c8e79a8e9e3 100644 +--- a/mesonbuild/dependencies/base.py ++++ b/mesonbuild/dependencies/base.py +@@ -114,7 +114,7 @@ class Dependency: def need_threads(self): return False - def get_pkgconfig_variable(self, variable_name): + def get_pkgconfig_variable(self, variable_name, use_native=False): - raise MesonException('Tried to get a pkg-config variable from a non-pkgconfig dependency.') + raise NotImplementedError('{!r} is not a pkgconfig dependency'.format(self.name)) + - class InternalDependency(Dependency): -@@ -224,8 +224,12 @@ class PkgConfigDependency(Dependency): +@@ -256,8 +256,12 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs) @@ -31,9 +41,9 @@ index 04a22f985941..3e33bc4a79e7 100644 return p.returncode, out.strip() def _set_cargs(self): -@@ -259,8 +263,8 @@ class PkgConfigDependency(Dependency): +@@ -291,8 +295,8 @@ class PkgConfigDependency(ExternalDependency): self.is_libtool = True - self.libs.append(lib) + self.link_args.append(lib) - def get_pkgconfig_variable(self, variable_name): - ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name]) @@ -42,7 +52,11 @@ index 04a22f985941..3e33bc4a79e7 100644 variable = '' if ret != 0: if self.required: -@@ -1091,7 +1095,7 @@ class QtBaseDependency(Dependency): +diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py +index 8f183e54d4d2..34ef33e79ad9 100644 +--- a/mesonbuild/dependencies/ui.py ++++ b/mesonbuild/dependencies/ui.py +@@ -239,7 +239,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 @@ -51,16 +65,7 @@ index 04a22f985941..3e33bc4a79e7 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -1202,7 +1206,7 @@ class Qt5Dependency(QtBaseDependency): - QtBaseDependency.__init__(self, 'qt5', env, kwargs) - - def get_pkgconfig_host_bins(self, core): -- return core.get_pkgconfig_variable('host_bins') -+ return core.get_pkgconfig_variable('host_bins', use_native=True) - - class Qt4Dependency(QtBaseDependency): - def __init__(self, env, kwargs): -@@ -1216,7 +1220,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -69,3 +74,15 @@ index 04a22f985941..3e33bc4a79e7 100644 except MesonException: pass +@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency): + QtBaseDependency.__init__(self, 'qt5', env, kwargs) + + def get_pkgconfig_host_bins(self, core): +- return core.get_pkgconfig_variable('host_bins') ++ return core.get_pkgconfig_variable('host_bins', use_native=True) + + + # There are three different ways of depending on SDL2: +-- +2.15.0 + diff --git a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb b/meta-oe/recipes-devtools/meson/meson_0.43.0.bb similarity index 88% rename from meta-oe/recipes-devtools/meson/meson_0.40.1.bb rename to meta-oe/recipes-devtools/meson/meson_0.43.0.bb index 14644ba9ba0a..0953eadc7e7d 100644 --- a/meta-oe/recipes-devtools/meson/meson_0.40.1.bb +++ b/meta-oe/recipes-devtools/meson/meson_0.43.0.bb @@ -9,7 +9,7 @@ SRC_URI = " \ file://native_bindir.patch \ " -SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240" +SRCREV = "5626df46453e73b63827c4542aae36443fbd928b" S = "${WORKDIR}/git" -- 2.15.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
