Commit b4c2048b authored by Xavier Claessens's avatar Xavier Claessens Committed by Nirbheek Chauhan
Browse files

Fix the meson recipe and bump version to 0.45.1

Now that cerbero is running with python3, PYTHONPATH is refering to
python3 path. This makes the meson built inside cerbero usable with our
build env.

https://bugzilla.gnome.org/show_bug.cgi?id=789316
parent fccf01d4
......@@ -29,7 +29,7 @@ from cerbero.errors import FatalError, ConfigurationError
class BuildTools (BootstrapperBase):
BUILD_TOOLS = ['automake', 'autoconf', 'm4', 'libtool', 'pkg-config',
'orc-tool', 'gettext-m4', 'gettext-tools']
'orc-tool', 'gettext-m4', 'gettext-tools', 'meson']
PLAT_BUILD_TOOLS = {
Platform.DARWIN: ['intltool', 'yasm', 'bison', 'flex'],
Platform.WINDOWS: ['intltool', 'yasm'],
......
......@@ -96,6 +96,7 @@ class Config (object):
def __init__(self):
self._check_uninstalled()
self.python_exe = sys.executable
for a in self._properties:
setattr(self, a, None)
......@@ -238,7 +239,13 @@ class Config (object):
'cerbero-registry-%s' % self.target_arch)
gstregistry = os.path.expanduser(gstregistry)
gstregistry10 = os.path.expanduser(gstregistry10)
pythonpath = os.path.join(prefix, py_prefix, 'site-packages')
# Ensure python paths exists because setup.py won't create them
pythonpath = [os.path.join(prefix, py_prefix, 'site-packages'),
os.path.join(self.build_tools_prefix, py_prefix, 'site-packages')]
for path in pythonpath:
self._create_path(path)
pythonpath = os.pathsep.join(pythonpath)
if self.platform == Platform.LINUX:
xdgdatadir += ":/usr/share:/usr/local/share"
......
......@@ -5,17 +5,17 @@ import stat
class Recipe(recipe.Recipe):
name = 'meson'
version = '0.36.0'
version = '0.45.1'
licenses = [License.Apachev2]
btype = BuildType.CUSTOM
remotes = {'origin': 'https://github.com/mesonbuild/meson.git'}
commit = '0.36.0'
commit = version
deps = ['ninja']
files_bin = ['bin/meson']
files_python = []
def install(self):
os.chdir(self.build_dir)
shell.call('./install_meson.py --prefix %s' %
self.config.prefix)
shell.call('%s setup.py install --prefix %s' %
(self.config.python_exe, self.config.prefix),
self.build_dir)
......@@ -13,8 +13,7 @@ class Recipe(recipe.Recipe):
files_bin = ['bin/ninja']
def configure(self):
os.chdir(self.build_dir)
shell.call('./configure.py --bootstrap')
shell.call('./configure.py --bootstrap', self.build_dir)
def install(self):
try:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment