diff options
Diffstat (limited to 'rules/gobject-introspection.make')
| -rw-r--r-- | rules/gobject-introspection.make | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/rules/gobject-introspection.make b/rules/gobject-introspection.make index fda19cd13..4da94161b 100644 --- a/rules/gobject-introspection.make +++ b/rules/gobject-introspection.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GOBJECT_INTROSPECTION) += gobject-introspection # # Paths and names # -GOBJECT_INTROSPECTION_VERSION := 1.56.1 -GOBJECT_INTROSPECTION_MD5 := 62e5f5685b8d9752fdeaf17c057d53d1 +GOBJECT_INTROSPECTION_VERSION := 1.66.1 +GOBJECT_INTROSPECTION_MD5 := f43d661d39ff52d33622cb1854aaaf76 GOBJECT_INTROSPECTION := gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION) GOBJECT_INTROSPECTION_SUFFIX := tar.xz GOBJECT_INTROSPECTION_URL := $(call ptx/mirror, GNOME, gobject-introspection/$(basename $(GOBJECT_INTROSPECTION_VERSION))/$(GOBJECT_INTROSPECTION).$(GOBJECT_INTROSPECTION_SUFFIX)) @@ -28,21 +28,23 @@ GOBJECT_INTROSPECTION_LICENSE := LGPL-2.1-or-later AND GPL-2.0-or-later # ---------------------------------------------------------------------------- # -# autoconf +# meson # -GOBJECT_INTROSPECTION_CONF_TOOL := autoconf +GOBJECT_INTROSPECTION_CONF_TOOL := meson GOBJECT_INTROSPECTION_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-doctool \ - --without-cairo \ - --with-python=$(SYSTEMPYTHON3) + $(CROSS_MESON_USR) \ + -Dbuild_introspection_data=true \ + -Dcairo=disabled \ + -Ddoctool=disabled \ + -Dgi_cross_binary_wrapper=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \ + -Dgi_cross_ldd_wrapper=$(PTXDIST_SYSROOT_CROSS)/bin/qemu/ldd \ + -Dgi_cross_use_prebuilt_gi=true \ + -Dgtk_doc=false \ + -Dpython=$(SYSTEMPYTHON3) # needed so g-ir-compiler runs in qemu GOBJECT_INTROSPECTION_MAKE_ENV = \ - GI_CROSS_LAUNCHER="$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross -E LD_LIBRARY_PATH='$(GOBJECT_INTROSPECTION_DIR)/.libs:$(QEMU_CROSS_LD_LIBRARY_PATH)'" + CROSS_LD_LIBRARY_PATH=$(GOBJECT_INTROSPECTION_DIR)-build/girepository # ---------------------------------------------------------------------------- # Install |