Commit e2849eeb authored by Matthew Waters's avatar Matthew Waters 🐨

bootstrap: always build glib-tools when targetting non-linux

Fixes out of date glib tools throwing errors.

/usr/bin/glib-genmarshal --prefix _gdk_pixbuf_marshal --output gdk-pixbuf/gdk-pixbuf-marshal.h --pragma-once --header ../gdk-pixbuf/gdk-pixbuf-marshal.list
FAILED: gdk-pixbuf/gdk-pixbuf-marshal.h
/usr/bin/glib-genmarshal --prefix _gdk_pixbuf_marshal --output gdk-pixbuf/gdk-pixbuf-marshal.h --pragma-once --header ../gdk-pixbuf/gdk-pixbuf-marshal.list

(process:12337): GLib-Genmarshal-WARNING **: failed to open "--output": No such file or directory

(process:12337): GLib-Genmarshal-WARNING **: failed to open "gdk-pixbuf/gdk-pixbuf-marshal.h": No such file or directory

(process:12337): GLib-Genmarshal-WARNING **: failed to open "--pragma-once": No such file or directory

...
parent 1225ec54
......@@ -65,7 +65,7 @@ class BuildTools (BootstrapperBase):
if self.config.distro_version in [DistroVersion.UBUNTU_LUCID,
DistroVersion.UBUNTU_NATTY]:
self.BUILD_TOOLS.append('glib-tools')
if self.config.platform != Platform.LINUX and not \
if self.config.target_platform != Platform.LINUX and not \
self.config.prefix_is_executable():
# For glib-mkenums and glib-genmarshal
self.BUILD_TOOLS.append('glib-tools')
......
......@@ -11,7 +11,7 @@ class Recipe(recipe.Recipe):
licenses = [License.LGPLv2Plus]
btype = BuildType.MESON
meson_options = {'gtk_doc': 'false', 'internal_pcre': 'true', 'libmount': 'false',
'dtrace': 'false', 'iconv': 'libc'}
'dtrace': 'false', 'iconv': 'libc', 'selinux' : 'false'}
deps = ['libffi', 'zlib']
patches = ['../glib/glib-2.57-meson-backported-fixes.patch',
'../glib/0001-DO-NOT-UPSTREAM-Prototypes-missing-in-Cerbero-s-anci.patch',
......
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