mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
@@ -4,12 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.64
|
||||
GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).1
|
||||
GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.70
|
||||
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_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
|
||||
GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
|
||||
GOBJECT_INTROSPECTION_AUTORECONF = YES
|
||||
GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause
|
||||
GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l
|
||||
|
||||
@@ -43,7 +42,7 @@ HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \
|
||||
# Use the host gi-scanner to prevent the scanner from generating incorrect
|
||||
# elf classes.
|
||||
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_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
|
||||
-Dbuild_introspection_data=true \
|
||||
@@ -64,10 +63,10 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \
|
||||
GI_SCANNER_DISABLE_CACHE=1
|
||||
|
||||
# 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
|
||||
HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
|
||||
HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH
|
||||
|
||||
# Perform the following:
|
||||
# - Just as above, Ensure that g-ir-tool-template.in uses the host python.
|
||||
@@ -75,7 +74,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
|
||||
# which may then get deleted (or their dependencies) and potentially segfault
|
||||
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 \
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper
|
||||
@@ -84,6 +83,8 @@ define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
|
||||
$(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
|
||||
$(SED) "s%@QEMU_USERMODE_ARGS@%$(call qstrip,$(BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS))%g" \
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
|
||||
$(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
|
||||
|
||||
@@ -116,23 +117,29 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
|
||||
|
||||
# Gobject-introspection installs Makefile.introspection in
|
||||
# $(STAGING_DIR)/usr/share which is needed for autotools-based programs to
|
||||
# build .gir and .typelib files. Unfortuantly, gobject-introspection-1.0.pc
|
||||
# build .gir and .typelib files. Unfortunately, gobject-introspection-1.0.pc
|
||||
# uses $(prefix)/share as the directory, which
|
||||
# causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share.
|
||||
# Change datarootdir to $(libdir)/../share which will prefix $(STAGING_DIR)
|
||||
# Change datadir to $(libdir)/../share which will prefix $(STAGING_DIR)
|
||||
# to the correct location.
|
||||
$(SED) "s%datarootdir=.*%datarootdir=\$${libdir}/../share%g" \
|
||||
$(SED) "s%^datadir=.*%datadir=\$${libdir}/../share%g" \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
|
||||
|
||||
# By default, girdir and typelibdir use datadir and libdir as their prefix,
|
||||
# of which pkg-config appends the sysroot directory. This results in files
|
||||
# being installed in $(STAGING_DIR)/$(STAGING_DIR)/path/to/files.
|
||||
# Changing the prefix to exec_prefix prevents this error.
|
||||
$(SED) "s%girdir=.*%girdir=\$${exec_prefix}/share/gir-1.0%g" \
|
||||
# Changing the prefix to prefix prevents this error.
|
||||
$(SED) "s%girdir=.*%girdir=\$${prefix}/share/gir-1.0%g" \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
|
||||
|
||||
$(SED) "s%typelibdir=.*%typelibdir=\$${exec_prefix}/lib/girepository-1.0%g" \
|
||||
$(SED) "s%typelibdir=.*%typelibdir=\$${prefix}/lib/girepository-1.0%g" \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
|
||||
|
||||
# Set includedir to $(STAGING_DIR)/usr/share/gir-1.0 instead of . or
|
||||
# g-ir-compiler won't find .gir files resulting in a build failure for
|
||||
# autotools-based based programs
|
||||
$(SED) "s%includedir=.%includedir=$(STAGING_DIR)/usr/share/gir-1.0%g" \
|
||||
$(STAGING_DIR)/usr/share/gobject-introspection-1.0/Makefile.introspection
|
||||
endef
|
||||
GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user