|
@@ -4,8 +4,8 @@
|
|
#
|
|
#
|
|
################################################################################
|
|
################################################################################
|
|
|
|
|
|
-GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.64
|
|
|
|
-GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).1
|
|
|
|
|
|
+GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.68
|
|
|
|
+GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
|
|
GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
|
|
GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
|
|
GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
|
|
GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
|
|
GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
|
|
GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
|
|
@@ -43,7 +43,7 @@ HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \
|
|
# Use the host gi-scanner to prevent the scanner from generating incorrect
|
|
# Use the host gi-scanner to prevent the scanner from generating incorrect
|
|
# elf classes.
|
|
# elf classes.
|
|
GOBJECT_INTROSPECTION_CONF_OPTS = \
|
|
GOBJECT_INTROSPECTION_CONF_OPTS = \
|
|
- -Dgi_cross_use_host_gi=true \
|
|
|
|
|
|
+ -Dgi_cross_use_prebuilt_gi=true \
|
|
-Dgi_cross_binary_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \
|
|
-Dgi_cross_binary_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \
|
|
-Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
|
|
-Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
|
|
-Dbuild_introspection_data=true \
|
|
-Dbuild_introspection_data=true \
|
|
@@ -64,8 +64,8 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \
|
|
GI_SCANNER_DISABLE_CACHE=1
|
|
GI_SCANNER_DISABLE_CACHE=1
|
|
|
|
|
|
# Make sure g-ir-tool-template uses the host python.
|
|
# Make sure g-ir-tool-template uses the host python.
|
|
-define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
|
|
|
|
- $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
|
|
|
|
|
|
+define GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH
|
|
|
|
+ $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in
|
|
endef
|
|
endef
|
|
HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
|
|
HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
|
|
|
|
|
|
@@ -75,7 +75,7 @@ HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOL
|
|
# - Create a safe modules directory which does not exist so we don't load random things
|
|
# - Create a safe modules directory which does not exist so we don't load random things
|
|
# which may then get deleted (or their dependencies) and potentially segfault
|
|
# which may then get deleted (or their dependencies) and potentially segfault
|
|
define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
|
|
define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
|
|
- $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
|
|
|
|
|
|
+ $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in
|
|
|
|
|
|
$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \
|
|
$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \
|
|
$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper
|
|
$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper
|