diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-12-03 15:27:52 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-12-04 08:16:28 +0100 |
| commit | c7d53b7d511e3ab698a9d8a565a1093569b769f7 (patch) | |
| tree | 1d1a7ca6bab7183eec9d2bf631ac2613a7f6fbc4 /rules | |
| parent | 1f3a5cf12f75a793facd41a8409a993ab72af844 (diff) | |
| download | ptxdist-c7d53b7d511e3ab698a9d8a565a1093569b769f7.tar.gz ptxdist-c7d53b7d511e3ab698a9d8a565a1093569b769f7.tar.xz | |
gobject-introspection: version bump 1.56.1 -> 1.66.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/gobject-introspection.in | 2 | ||||
| -rw-r--r-- | rules/gobject-introspection.make | 26 | ||||
| -rw-r--r-- | rules/host-gobject-introspection.in | 1 | ||||
| -rw-r--r-- | rules/host-gobject-introspection.make | 22 |
4 files changed, 27 insertions, 24 deletions
diff --git a/rules/gobject-introspection.in b/rules/gobject-introspection.in index 6fc1917c7..8fdf5cc91 100644 --- a/rules/gobject-introspection.in +++ b/rules/gobject-introspection.in @@ -14,6 +14,8 @@ config GOBJECT_INTROSPECTION default GOBJECT_INTROSPECTION_HELPER select HOST_CHRPATH select HOST_GOBJECT_INTROSPECTION + select HOST_MESON + select HOST_SYSTEM_PYTHON3 select GLIB endif 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 diff --git a/rules/host-gobject-introspection.in b/rules/host-gobject-introspection.in index 52e53bb80..594dfee64 100644 --- a/rules/host-gobject-introspection.in +++ b/rules/host-gobject-introspection.in @@ -3,6 +3,7 @@ config HOST_GOBJECT_INTROSPECTION tristate default y if ALLYES + select HOST_MESON select HOST_SYSTEM_PYTHON3 select HOST_SYSTEM_PYTHON3_DEV select HOST_GLIB diff --git a/rules/host-gobject-introspection.make b/rules/host-gobject-introspection.make index 5c8e4e08c..d14b9ab34 100644 --- a/rules/host-gobject-introspection.make +++ b/rules/host-gobject-introspection.make @@ -18,15 +18,14 @@ HOST_PACKAGES-$(PTXCONF_HOST_GOBJECT_INTROSPECTION) += host-gobject-introspectio # # autoconf # -HOST_GOBJECT_INTROSPECTION_CONF_TOOL := autoconf +HOST_GOBJECT_INTROSPECTION_CONF_TOOL := meson HOST_GOBJECT_INTROSPECTION_CONF_OPT := \ - $(HOST_AUTOCONF) \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-doctool \ - --without-cairo \ - --with-python=$(SYSTEMPYTHON3) + $(HOST_MESON_OPT) \ + -Dbuild_introspection_data=false \ + -Dcairo=disabled \ + -Ddoctool=disabled \ + -Dgtk_doc=false \ + -Dpython=$(SYSTEMPYTHON3) # ---------------------------------------------------------------------------- # Install @@ -40,11 +39,10 @@ $(STATEDIR)/host-gobject-introspection.install.post: @echo 'export pkg_ldflags="$$(find -H $${pkg_dir} -name .libs -printf "-Wl,-rpath,%p ")$${pkg_ldflags}"' \ >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner @echo 'export CC=$(CROSS_CC)' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner - @echo 'export GI_CROSS_LAUNCHER="$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross"' \ - >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner - @echo 'PATH="$(PTXDIST_SYSROOT_CROSS)/bin/qemu:$$PATH"' \ - >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner @echo 'exec "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ + --use-binary-wrapper="$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross" \ + --use-ldd-wrapper="$(PTXDIST_SYSROOT_CROSS)/bin/qemu/ldd" \ + --add-include-path=${PTXDIST_SYSROOT_TARGET}/usr/share/gir-1.0 \ "$${@}"' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner |