aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/meson/meson
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-11-17 14:12:02 +0200
committerArmin Kuster <akuster808@gmail.com>2018-01-16 21:41:26 -0800
commit8cef6b38e62e6c79ec857510df454cefc868b0df (patch)
treeb1848cb7b677e05f9cde97451d0c92337ad023c2 /meta-oe/recipes-devtools/meson/meson
parentfb08dfed3eda0511660ff28bd23cf30e0e378705 (diff)
downloadmeta-openembedded-contrib-8cef6b38e62e6c79ec857510df454cefc868b0df.tar.gz
meta-openembedded-contrib-8cef6b38e62e6c79ec857510df454cefc868b0df.tar.bz2
meta-openembedded-contrib-8cef6b38e62e6c79ec857510df454cefc868b0df.zip
meson: remove recipe and class
They have been moved to oe-core layer, as meson is increasingly the primary build system for many projects, particularly in the Gnome stack. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/meson/meson')
-rw-r--r--meta-oe/recipes-devtools/meson/meson/native_bindir.patch71
1 files changed, 0 insertions, 71 deletions
diff --git a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
deleted file mode 100644
index 993e9750e3..0000000000
--- a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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 <ricardo.ribalda@gmail.com>
-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:
- 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.')
-
- class InternalDependency(Dependency):
-@@ -224,8 +224,12 @@ class PkgConfigDependency(Dependency):
- return s.format(self.__class__.__name__, self.name, self.is_found,
- self.version_reqs)
-
-- def _call_pkgbin(self, args):
-- p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2]
-+ def _call_pkgbin(self, args, use_native=False):
-+ if use_native:
-+ pkgbin = [self.pkgbin + "-native"]
-+ else:
-+ pkgbin = [self.pkgbin]
-+ p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2]
- return p.returncode, out.strip()
-
- def _set_cargs(self):
-@@ -259,8 +263,8 @@ class PkgConfigDependency(Dependency):
- self.is_libtool = True
- self.libs.append(lib)
-
-- def get_pkgconfig_variable(self, variable_name):
-- ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name])
-+ def get_pkgconfig_variable(self, variable_name, use_native=False):
-+ ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name], use_native=use_native)
- variable = ''
- if ret != 0:
- if self.required:
-@@ -1091,7 +1095,7 @@ class QtBaseDependency(Dependency):
- self.bindir = self.get_pkgconfig_host_bins(core)
- if not self.bindir:
- # If exec_prefix is not defined, the pkg-config file is broken
-- prefix = core.get_pkgconfig_variable('exec_prefix')
-+ prefix = core.get_pkgconfig_variable('exec_prefix', use_native=True)
- 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):
- applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
- for application in applications:
- try:
-- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application))
-+ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, use_native=True))
- except MesonException:
- pass
-