diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-17 17:55:43 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-19 07:00:18 +0100 |
| commit | f799ce54ab8fb71706e2be3edbe3fe2a437de59c (patch) | |
| tree | a322f0fad8f86436d2204592d0195b39ecc4cf03 /rules/host-glib.make | |
| parent | 691ef41f01f42f877d3f1d9bfd5b2e09585dd8b4 (diff) | |
| download | ptxdist-f799ce54ab8fb71706e2be3edbe3fe2a437de59c.tar.gz ptxdist-f799ce54ab8fb71706e2be3edbe3fe2a437de59c.tar.xz | |
glib: version bump 2.56.3 -> 2.60.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/host-glib.make')
| -rw-r--r-- | rules/host-glib.make | 52 |
1 files changed, 17 insertions, 35 deletions
diff --git a/rules/host-glib.make b/rules/host-glib.make index 1278e97f4..50501f47d 100644 --- a/rules/host-glib.make +++ b/rules/host-glib.make @@ -22,44 +22,26 @@ HOST_GLIB_DIR = $(HOST_BUILDDIR)/$(GLIB) # Prepare # ---------------------------------------------------------------------------- -HOST_GLIB_CONF_ENV := \ - $(HOST_ENV) \ - ac_cv_path_MSGFMT="" \ - ac_cv_path_XGETTEXT="" \ - ac_cv_prog_GTKDOC_CHECK="" \ - ac_cv_path_GTKDOC_REBASE="" \ - ac_cv_path_GTKDOC_MKPDF="" - # -# autoconf +# meson # -HOST_GLIB_CONF_TOOL := autoconf +HOST_GLIB_CONF_TOOL := meson HOST_GLIB_CONF_OPT := \ - $(HOST_AUTOCONF) \ - --disable-maintainer-mode \ - --disable-debug \ - --disable-gc-friendly \ - --enable-mem-pools \ - --disable-installed-tests \ - --disable-always-build-tests \ - --disable-static \ - --enable-shared \ - --disable-included-printf \ - --disable-selinux \ - --disable-fam \ - --disable-xattr \ - --disable-libelf \ - --disable-libmount \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-man \ - --disable-dtrace \ - --disable-systemtap \ - --disable-coverage \ - --with-libiconv=no \ - --with-threads=posix \ - --with-pcre=system + $(HOST_MESON_OPT) \ + -Dbsymbolic_functions=true \ + -Ddtrace=false \ + -Dfam=false \ + -Dforce_posix_threads=true \ + -Dgtk_doc=false \ + -Diconv=libc \ + -Dinstalled_tests=false \ + -Dinternal_pcre=false \ + -Dlibmount=false \ + -Dman=false \ + -Dnls=disabled \ + -Dselinux=disabled \ + -Dsystemtap=false \ + -Dxattr=false $(STATEDIR)/host-glib.install.post: @$(call targetinfo) |