* [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection
@ 2018-03-14 17:12 Adam Duskett
0 siblings, 0 replies; 9+ messages in thread
From: Adam Duskett @ 2018-03-14 17:12 UTC (permalink / raw)
To: buildroot
Add a BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS which will be referenced by the
gobject-introspection package. This also has the added benefit of making the
config file conform to other package standards such as Valgrind.
Add depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 to
Config.in.host as these are not currently supported cpus by qemu.
Add a new variable in qemu.mk: HOST_QEMU_CPU_TUNE. When qemu-$(ARCH) is
called, some architectures require a -cpu flag to be passed, or else a
segfault may occure when building .gir files.
For PowerPC, many of these cpu's need a specific CPU flag to be passed
via the command line.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
Changes v1 -> v4:
- Add patch to series.
package/qemu/Config.in.host | 11 ++++++++---
package/qemu/qemu.mk | 31 +++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
index f14bcec6d6..0ef4c700b0 100644
--- a/package/qemu/Config.in.host
+++ b/package/qemu/Config.in.host
@@ -1,11 +1,16 @@
-config BR2_PACKAGE_HOST_QEMU
- bool "host qemu"
- depends on BR2_arm || BR2_armeb || BR2_aarch64 || \
+config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
+ bool
+ default y if BR2_arm || BR2_armeb || BR2_aarch64 || \
BR2_i386 || BR2_m68k || BR2_microblazeel || \
BR2_microblazebe || BR2_mips || BR2_mipsel || \
BR2_mips64 || BR2_mips64el || BR2_powerpc || \
BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \
BR2_sparc || BR2_x86_64
+ depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970
+
+config BR2_PACKAGE_HOST_QEMU
+ bool "host qemu"
+ depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \
if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE
help
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 345ef52668..62cb517628 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -70,6 +70,37 @@ endif
ifeq ($(HOST_QEMU_ARCH),sh4aeb)
HOST_QEMU_ARCH = sh4eb
endif
+
+# Add cpu specific callouts for qemu.
+# In some cases (e.g. ppc) simply being arch specific (apparently) isn't good
+# enough and a PACKAGE_ARCH specific -cpu option is needed
+# For others (e.g. arm) a -cpu option is not necessary, since the
+# qemu-arm default CPU supports all required architecture levels.
+ifeq ($(BR2_x86_64),y)
+HOST_QEMU_CPU_TUNE = -cpu Nehalem,check=false
+endif
+
+# PowerPC architecture. Currently, the 620, 630, and 970 are not supported.
+ifeq ($(BR2_powerpc_e5500),y)
+HOST_QEMU_CPU_TUNE = -cpu e5500
+endif
+
+ifeq ($(BR2_powerpc_e6500),y)
+HOST_QEMU_CPU_TUNE = -cpu e6500
+endif
+
+ifeq ($(BR2_powerpc_power7),y)
+HOST_QEMU_CPU_TUNE = -cpu 7400
+endif
+
+ifeq ($(BR2_powerpc64)$(BR2_powerpc_e5500),yy)
+HOST_QEMU_CPU_TUNE = -cpu e500mc
+endif
+
+ifeq ($(BR2_powerpc64)$(BR2_powerpc_e6500),yy)
+HOST_QEMU_CPU_TUNE = -cpu e500mc
+endif
+
HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH)
ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y)
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v4 0/4] gobject-introspection: new series
@ 2018-03-14 17:24 Adam Duskett
2018-03-14 17:24 ` [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection Adam Duskett
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Adam Duskett @ 2018-03-14 17:24 UTC (permalink / raw)
To: buildroot
For official submission to mainline Buildroot:
This new series has the following upgrades:
- It now works on all architectures supported by qemu-host.
- Gstreamer1 can now use it (for real this time).
- General makefile cleanups.
- New patches that make cross-compiling a bit nicer (thanks, yocto!)
- Removed a patch that was yocto specific and not needed with buildroot.
- Added a PKG_GIR_EXTRA_LIBS variable in pkg-autotools.mk
What I could use help with:
- Package updates: I will get around to updating python-gobject as it's needed
for GStreamer-python (the entire reason I started this venture)
- Comments on the patches themselves would also be appreciated!.
Thanks!
Adam
Adam Duskett (4):
qemu: cleanup for gobject-introspection
gstreamer1 packages: explicitly disable introspection
gobject-introspection: new package
gstreamer1 packages: add support for introspection
DEVELOPERS | 1 +
Makefile | 2 +
package/Config.in | 1 +
...ncomplete-upstream-attempt-at-cross-compi.patch | 50 +++
...c-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 203 ++++++++++++
...3-giscanner-add-use-binary-wrapper-option.patch | 52 +++
...04-giscanner-add-a-use-ldd-wrapper-option.patch | 48 +++
.../0005-add-PYTHON_INCLUDES-override.patch | 39 +++
...06-giscanner-add-a-lib-dirs-envvar-option.patch | 73 +++++
.../0007-Add-rpath-links-to-ccompiler.patch | 29 ++
.../gobject-introspection/0008-add-Float128.patch | 28 ++
package/gobject-introspection/Config.in | 30 ++
package/gobject-introspection/cross-ldd | 362 +++++++++++++++++++++
package/gobject-introspection/g-ir-compiler.in | 2 +
.../g-ir-scanner-lddwrapper.in | 2 +
.../g-ir-scanner-qemuwrapper.in | 10 +
package/gobject-introspection/g-ir-scanner.in | 3 +
.../gobject-introspection.hash | 4 +
.../gobject-introspection/gobject-introspection.mk | 90 +++++
.../gst1-plugins-bad/gst1-plugins-bad.mk | 8 +-
...ncorrect-reference-to-gstreamer-sdp-in-Ma.patch | 28 ++
.../gst1-plugins-base/gst1-plugins-base.mk | 8 +-
package/gstreamer1/gstreamer1/gstreamer1.mk | 7 +
package/pkg-autotools.mk | 3 +
package/qemu/Config.in.host | 11 +-
package/qemu/qemu.mk | 31 ++
26 files changed, 1120 insertions(+), 5 deletions(-)
create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
create mode 100644 package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
create mode 100644 package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
create mode 100644 package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
create mode 100644 package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch
create mode 100644 package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
create mode 100644 package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
create mode 100644 package/gobject-introspection/0008-add-Float128.patch
create mode 100644 package/gobject-introspection/Config.in
create mode 100644 package/gobject-introspection/cross-ldd
create mode 100644 package/gobject-introspection/g-ir-compiler.in
create mode 100644 package/gobject-introspection/g-ir-scanner-lddwrapper.in
create mode 100644 package/gobject-introspection/g-ir-scanner-qemuwrapper.in
create mode 100644 package/gobject-introspection/g-ir-scanner.in
create mode 100644 package/gobject-introspection/gobject-introspection.hash
create mode 100644 package/gobject-introspection/gobject-introspection.mk
create mode 100644 package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
--
2.14.3
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection
2018-03-14 17:24 [Buildroot] [PATCH v4 0/4] gobject-introspection: new series Adam Duskett
@ 2018-03-14 17:24 ` Adam Duskett
2018-03-14 18:02 ` Yann E. MORIN
2018-03-14 17:24 ` [Buildroot] [PATCH v4 2/4] gstreamer1 packages: explicitly disable introspection Adam Duskett
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Adam Duskett @ 2018-03-14 17:24 UTC (permalink / raw)
To: buildroot
Add a BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS which will be referenced by the
gobject-introspection package. This also has the added benefit of making the
config file conform to other package standards such as Valgrind.
Add depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 to
Config.in.host as these are not currently supported cpus by qemu.
Add a new variable in qemu.mk: HOST_QEMU_CPU_TUNE. When qemu-$(ARCH) is
called, some architectures require a -cpu flag to be passed, or else a
segfault may occure when building .gir files.
For PowerPC, many of these cpu's need a specific CPU flag to be passed
via the command line.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
Changes v1 -> v4:
- Add patch to series.
package/qemu/Config.in.host | 11 ++++++++---
package/qemu/qemu.mk | 31 +++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
index f14bcec6d6..0ef4c700b0 100644
--- a/package/qemu/Config.in.host
+++ b/package/qemu/Config.in.host
@@ -1,11 +1,16 @@
-config BR2_PACKAGE_HOST_QEMU
- bool "host qemu"
- depends on BR2_arm || BR2_armeb || BR2_aarch64 || \
+config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
+ bool
+ default y if BR2_arm || BR2_armeb || BR2_aarch64 || \
BR2_i386 || BR2_m68k || BR2_microblazeel || \
BR2_microblazebe || BR2_mips || BR2_mipsel || \
BR2_mips64 || BR2_mips64el || BR2_powerpc || \
BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \
BR2_sparc || BR2_x86_64
+ depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970
+
+config BR2_PACKAGE_HOST_QEMU
+ bool "host qemu"
+ depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \
if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE
help
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 345ef52668..62cb517628 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -70,6 +70,37 @@ endif
ifeq ($(HOST_QEMU_ARCH),sh4aeb)
HOST_QEMU_ARCH = sh4eb
endif
+
+# Add cpu specific callouts for qemu.
+# In some cases (e.g. ppc) simply being arch specific (apparently) isn't good
+# enough and a PACKAGE_ARCH specific -cpu option is needed
+# For others (e.g. arm) a -cpu option is not necessary, since the
+# qemu-arm default CPU supports all required architecture levels.
+ifeq ($(BR2_x86_64),y)
+HOST_QEMU_CPU_TUNE = -cpu Nehalem,check=false
+endif
+
+# PowerPC architecture. Currently, the 620, 630, and 970 are not supported.
+ifeq ($(BR2_powerpc_e5500),y)
+HOST_QEMU_CPU_TUNE = -cpu e5500
+endif
+
+ifeq ($(BR2_powerpc_e6500),y)
+HOST_QEMU_CPU_TUNE = -cpu e6500
+endif
+
+ifeq ($(BR2_powerpc_power7),y)
+HOST_QEMU_CPU_TUNE = -cpu 7400
+endif
+
+ifeq ($(BR2_powerpc64)$(BR2_powerpc_e5500),yy)
+HOST_QEMU_CPU_TUNE = -cpu e500mc
+endif
+
+ifeq ($(BR2_powerpc64)$(BR2_powerpc_e6500),yy)
+HOST_QEMU_CPU_TUNE = -cpu e500mc
+endif
+
HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH)
ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y)
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v4 2/4] gstreamer1 packages: explicitly disable introspection
2018-03-14 17:24 [Buildroot] [PATCH v4 0/4] gobject-introspection: new series Adam Duskett
2018-03-14 17:24 ` [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection Adam Duskett
@ 2018-03-14 17:24 ` Adam Duskett
2018-03-14 18:05 ` Yann E. MORIN
2018-03-14 17:24 ` [Buildroot] [PATCH v4 3/4] gobject-introspection: new package Adam Duskett
2018-03-14 17:24 ` [Buildroot] [PATCH v4 4/4] gstreamer1 packages: add support for introspection Adam Duskett
3 siblings, 1 reply; 9+ messages in thread
From: Adam Duskett @ 2018-03-14 17:24 UTC (permalink / raw)
To: buildroot
To get gstreamer ready for introspection, we must first explicitly
disable gstreamer1, plugins base and plugins bad from using introspection.
If not, when gobject-introspection is compiled, these packages will fail to
build because the _GIR_EXTRA_LIBS_PATH variable is not set.
The other gstreamer1 packages do not need the _GIR_EXTRA_LIBS_PATH variable to
be set.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
Changes v1 -> v4:
- Add patch to series.
- Change TARGET_MAKE_ENV += GIR_EXTRA_LIBS_PATH to
PACKAGE_GIR_EXTRA_LIBS_PATH.
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 3 ++-
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 3 ++-
package/gstreamer1/gstreamer1/gstreamer1.mk | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 83cb94be81..595e62072c 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -21,7 +21,8 @@ GST1_PLUGINS_BAD_CONF_OPTS = \
--disable-winks \
--disable-android_media \
--disable-apple_media \
- --disable-acm
+ --disable-acm \
+ --enable-introspection=no
# Options which require currently unpackaged libraries
GST1_PLUGINS_BAD_CONF_OPTS += \
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index 10361ee3c6..f492c4a175 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -14,7 +14,8 @@ GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+
# gio_unix_2_0 is only used for tests
GST1_PLUGINS_BASE_CONF_OPTS = \
--disable-examples \
- --disable-valgrind
+ --disable-valgrind \
+ --enable-introspection=no
# Options which require currently unpackaged libraries
GST1_PLUGINS_BASE_CONF_OPTS += \
diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index ea9f29a4f3..25a799240d 100644
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -17,6 +17,7 @@ GSTREAMER1_CONF_OPTS = \
--disable-failing-tests \
--disable-valgrind \
--disable-benchmarks \
+ --enable-introspection=no \
$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \
$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \
$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v4 3/4] gobject-introspection: new package
2018-03-14 17:24 [Buildroot] [PATCH v4 0/4] gobject-introspection: new series Adam Duskett
2018-03-14 17:24 ` [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection Adam Duskett
2018-03-14 17:24 ` [Buildroot] [PATCH v4 2/4] gstreamer1 packages: explicitly disable introspection Adam Duskett
@ 2018-03-14 17:24 ` Adam Duskett
2018-03-14 18:49 ` Yann E. MORIN
2018-03-14 17:24 ` [Buildroot] [PATCH v4 4/4] gstreamer1 packages: add support for introspection Adam Duskett
3 siblings, 1 reply; 9+ messages in thread
From: Adam Duskett @ 2018-03-14 17:24 UTC (permalink / raw)
To: buildroot
GObject introspection is a middleware layer between C
libraries (using GObject) and language bindings. The C library
can be scanned at compile time and generate a metadata file,
in addition to the actual native C library. Then at runtime,
language bindings can read this metadata and automatically
provide bindings to call into the C library.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
Changes v1 -> v2:
- Fixed wrappers
- Added 0007-giscanner-add-a-lib-dirs-envvar-option.patch
- Added 0008-add-Float128.patch
Changes v2 -> v3:
- Removed Linux kernel dependency (baruch)
- Changed $(LINUX_VERSION) to $(BR2_TOOLCHAIN_HEADERS_AT_LEAST) (baruch)
- Changed @LINUX_VERSION@ in g-ir-scanner-qemuwrapper.in to
@TOOLCHAIN_HEADERS_VERSION@ to match the above variable change.
- Added BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET in Config.in
with only BR2_arm selected for now.
- Removed BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS in favor of the above change.
- Added two new lines in the base Makefile which removes any remaining .gir
or .rnc files from the target filing system, as these are not needed for
runtime, only compile time.
Changes v3 -> v4:
- Removed RFC tag.
- Added 0007-Add-rpath-links-to-ccompiler.patch
- Removed config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch as it is not
Yocto specific.
- Added the _GIR_EXTRA_LIBS_PATH to pkg-autotools.mk. This allows package
specific Gir libraries to be passed on to g-ir-scanner-qemuwrapper.
- Fixed a typo in g-ir-scanner-qemuwrapper.in.
- Remove BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET in favor of
BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
DEVELOPERS | 1 +
Makefile | 2 +
package/Config.in | 1 +
...ncomplete-upstream-attempt-at-cross-compi.patch | 50 +++
...c-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 203 ++++++++++++
...3-giscanner-add-use-binary-wrapper-option.patch | 52 +++
...04-giscanner-add-a-use-ldd-wrapper-option.patch | 48 +++
.../0005-add-PYTHON_INCLUDES-override.patch | 39 +++
...06-giscanner-add-a-lib-dirs-envvar-option.patch | 73 +++++
.../0007-Add-rpath-links-to-ccompiler.patch | 29 ++
.../gobject-introspection/0008-add-Float128.patch | 28 ++
package/gobject-introspection/Config.in | 30 ++
package/gobject-introspection/cross-ldd | 362 +++++++++++++++++++++
package/gobject-introspection/g-ir-compiler.in | 2 +
.../g-ir-scanner-lddwrapper.in | 2 +
.../g-ir-scanner-qemuwrapper.in | 10 +
package/gobject-introspection/g-ir-scanner.in | 3 +
.../gobject-introspection.hash | 4 +
.../gobject-introspection/gobject-introspection.mk | 90 +++++
package/pkg-autotools.mk | 3 +
20 files changed, 1032 insertions(+)
create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
create mode 100644 package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
create mode 100644 package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
create mode 100644 package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
create mode 100644 package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch
create mode 100644 package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
create mode 100644 package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
create mode 100644 package/gobject-introspection/0008-add-Float128.patch
create mode 100644 package/gobject-introspection/Config.in
create mode 100644 package/gobject-introspection/cross-ldd
create mode 100644 package/gobject-introspection/g-ir-compiler.in
create mode 100644 package/gobject-introspection/g-ir-scanner-lddwrapper.in
create mode 100644 package/gobject-introspection/g-ir-scanner-qemuwrapper.in
create mode 100644 package/gobject-introspection/g-ir-scanner.in
create mode 100644 package/gobject-introspection/gobject-introspection.hash
create mode 100644 package/gobject-introspection/gobject-introspection.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 41e1b54d99..a15530cf6c 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -34,6 +34,7 @@ F: package/audit/
F: package/busybox/
F: package/checkpolicy/
F: package/cppdb/
+F: package/gobject-introspection/
F: package/gstreamer1/gstreamer1/
F: package/gstreamer1/gstreamer1-mm/
F: package/gstreamer1/gst1-plugins-bad/
diff --git a/Makefile b/Makefile
index 957ba6634a..74a7600bc6 100644
--- a/Makefile
+++ b/Makefile
@@ -704,6 +704,8 @@ target-finalize: $(PACKAGES)
$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
$(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake
find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f
+ find $(TARGET_DIR)/usr/share/ -name '*.gir' -print0 | xargs -0 rm -f
+ find $(TARGET_DIR)/usr/share/ -name '*.rnc' -print0 | xargs -0 rm -f
find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \
\( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
ifneq ($(BR2_PACKAGE_GDB),y)
diff --git a/package/Config.in b/package/Config.in
index 9cd5d9c087..eeaab00598 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1470,6 +1470,7 @@ menu "Other"
source "package/glibmm/Config.in"
source "package/glm/Config.in"
source "package/gmp/Config.in"
+ source "package/gobject-introspection/Config.in"
source "package/gsl/Config.in"
source "package/gtest/Config.in"
source "package/jemalloc/Config.in"
diff --git a/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
new file mode 100644
index 0000000000..86ba666d24
--- /dev/null
+++ b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
@@ -0,0 +1,50 @@
+From 3a9d1e5ee0aae56fafec0beba2014c19e4ff310c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 23 Mar 2016 17:07:28 +0200
+Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile support
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ common.mk | 4 ----
+ giscanner/gdumpparser.py | 6 ------
+ 2 files changed, 10 deletions(-)
+
+diff --git a/common.mk b/common.mk
+index b778f7a..e26c637 100644
+--- a/common.mk
++++ b/common.mk
+@@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \
+ --add-include-path=$(top_builddir) \
+ --add-include-path=$(top_builddir)/gir
+
+-# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler.
+-# Normally will be undefined but can be set (e.g. to wine or qemu)
+-# when cross-compiling
+ INTROSPECTION_COMPILER = \
+ env PATH=".libs:$(PATH)" \
+- $(GI_CROSS_LAUNCHER) \
+ $(top_builddir)/g-ir-compiler$(EXEEXT)
+
+ INTROSPECTION_COMPILER_ARGS = \
+diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
+index 1134f33..9bdc2bc 100644
+--- a/giscanner/gdumpparser.py
++++ b/giscanner/gdumpparser.py
+@@ -162,12 +162,6 @@ blob containing data gleaned from GObject's primitive introspection."""
+ out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
+
+ args = []
+-
+- # Prepend the launcher command and arguments, if defined
+- launcher = os.environ.get('GI_CROSS_LAUNCHER')
+- if launcher:
+- args.extend(launcher.split())
+-
+ args.extend(self._binary.args)
+ args.append('--introspect-dump=%s,%s' % (in_path, out_path))
+
+--
+2.7.0
+
diff --git a/package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
new file mode 100644
index 0000000000..ef57c67de7
--- /dev/null
+++ b/package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
@@ -0,0 +1,203 @@
+From b1503fe2693d602b3e24e4b832dc0934960d5d22 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 19 Oct 2015 18:29:21 +0300
+Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper and introspection-data options
+
+With the first option, gobject-introspection tools (g-ir-doc-tool and g-ir-scanner)
+that are already installed in the host system will be used for building the source tree.
+
+With the second option, g-ir-scanner will be instructed to use an executable
+wrapper to run binaries it's producing, and g-ir-compiler will be run
+through the same wrapper (host system's g-ir-compiler cannot be used because
+it's producing architecture-specific output).
+
+With the third option, giscanner will be instructed to use a special ldd
+command instead of system's ldd (which does not work when the binary to inspect
+is compiled for a different architecture).
+
+With the fourth option, it is possible to disable building of introspection data
+(.gir and .typelib files), which may be difficult or impossible in cross-compilation
+environments, because of lack of emulation (or native hardware) for the target architecture
+on which the target binaries can be run.
+
+These options are useful when cross-compiling for a different target architecture.
+
+Upstream-Status: Pending [review on oe-core list]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Makefile.am | 2 ++
+ common.mk | 39 +++++++++++++++++++++++++++++++++++++++
+ configure.ac | 42 ++++++++++++++++++++++++++++++++++++++++++
+ tests/Makefile.am | 5 ++++-
+ 4 files changed, 87 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b080a89..ce8d29b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -21,7 +21,9 @@ include Makefile-cmph.am
+ include Makefile-girepository.am
+ include Makefile-giscanner.am
+ include Makefile-examples.am
++if BUILD_INTROSPECTION_DATA
+ include Makefile-gir.am
++endif
+ include Makefile-tools.am
+ include Makefile-msvcproj.am
+
+diff --git a/common.mk b/common.mk
+index e26c637..9f3a65f 100644
+--- a/common.mk
++++ b/common.mk
+@@ -6,6 +6,15 @@
+ # module itself.
+ #
+
++if USE_HOST_GI
++INTROSPECTION_SCANNER = \
++ env PATH="$(PATH)" \
++ LPATH=.libs \
++ CC="$(CC)" \
++ PYTHONPATH=$(top_builddir):$(top_srcdir) \
++ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
++ g-ir-scanner
++else
+ INTROSPECTION_SCANNER = \
+ env PATH=".libs:$(PATH)" \
+ LPATH=.libs \
+@@ -14,9 +23,24 @@ INTROSPECTION_SCANNER = \
+ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
+ $(top_builddir)/g-ir-scanner
++endif
++
++if USE_CROSS_WRAPPER
++CROSS_WRAPPER_ARG = --use-binary-wrapper=$(GI_CROSS_WRAPPER)
++else
++CROSS_WRAPPER_ARG =
++endif
++
++if USE_LDD_WRAPPER
++LDD_WRAPPER_ARG = --use-ldd-wrapper=$(GI_LDD_WRAPPER)
++else
++LDD_WRAPPER_ARG =
++endif
+
+ INTROSPECTION_SCANNER_ARGS = \
+ --verbose \
++ $(CROSS_WRAPPER_ARG) \
++ $(LDD_WRAPPER_ARG) \
+ -I$(top_srcdir) \
+ --add-include-path=$(srcdir) \
+ --add-include-path=$(top_srcdir)/gir \
+@@ -24,9 +48,15 @@ INTROSPECTION_SCANNER_ARGS = \
+ --add-include-path=$(top_builddir) \
+ --add-include-path=$(top_builddir)/gir
+
++if USE_CROSS_WRAPPER
++INTROSPECTION_COMPILER = \
++ env PATH=".libs:$(PATH)" \
++ $(GI_CROSS_WRAPPER) $(top_builddir)/.libs/g-ir-compiler$(EXEEXT)
++else
+ INTROSPECTION_COMPILER = \
+ env PATH=".libs:$(PATH)" \
+ $(top_builddir)/g-ir-compiler$(EXEEXT)
++endif
+
+ INTROSPECTION_COMPILER_ARGS = \
+ --includedir=$(srcdir) \
+@@ -35,6 +65,14 @@ INTROSPECTION_COMPILER_ARGS = \
+ --includedir=$(top_builddir) \
+ --includedir=$(top_builddir)/gir
+
++if USE_HOST_GI
++INTROSPECTION_DOCTOOL = \
++ env PATH="$(PATH)" \
++ LPATH=.libs \
++ PYTHONPATH=$(top_builddir):$(top_srcdir) \
++ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
++ g-ir-doc-tool
++else
+ INTROSPECTION_DOCTOOL = \
+ env PATH=".libs:$(PATH)" \
+ LPATH=.libs \
+@@ -42,6 +80,7 @@ INTROSPECTION_DOCTOOL = \
+ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
+ $(top_builddir)/g-ir-doc-tool
++endif
+
+ INTROSPECTION_DOCTOOL_ARGS = \
+ --add-include-path=$(srcdir) \
+diff --git a/configure.ac b/configure.ac
+index 6c91fa5..21340a5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -360,6 +360,48 @@ fi
+
+ AC_SUBST(EXTRA_LINK_FLAGS)
+
++AC_ARG_ENABLE([host-gi],
++[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])],
++[case "${enableval}" in
++ yes) host_gi=true ;;
++ no) host_gi=false ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-host-gi]) ;;
++esac],[host_gi=false])
++AM_CONDITIONAL([USE_HOST_GI], [test x$host_gi = xtrue])
++
++AC_ARG_ENABLE([gi-cross-wrapper],
++[AS_HELP_STRING([--enable-gi-cross-wrapper=path],[Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)])],
++[
++GI_CROSS_WRAPPER="${enableval}"
++use_wrapper=true
++],[
++GI_CROSS_WRAPPER=""
++use_wrapper=false
++])
++AC_SUBST(GI_CROSS_WRAPPER)
++AM_CONDITIONAL([USE_CROSS_WRAPPER], [test x$use_wrapper = xtrue])
++
++AC_ARG_ENABLE([gi-ldd-wrapper],
++[AS_HELP_STRING([--enable-gi-ldd-wrapper=path],[Use a ldd wrapper instead of system's ldd command in giscanner (useful when cross-compiling)])],
++[
++GI_LDD_WRAPPER="${enableval}"
++use_ldd_wrapper=true
++],[
++GI_LDD_WRAPPER=""
++use_ldd_wrapper=false
++])
++AC_SUBST(GI_LDD_WRAPPER)
++AM_CONDITIONAL([USE_LDD_WRAPPER], [test x$use_ldd_wrapper = xtrue])
++
++AC_ARG_ENABLE([introspection-data],
++[AS_HELP_STRING([--enable-introspection-data],[Build introspection data (.gir and .typelib files) in addition to library and tools])],
++[case "${enableval}" in
++ yes) introspection_data=true ;;
++ no) introspection_data=false ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-introspection-data]) ;;
++esac],[introspection_data=true])
++AM_CONDITIONAL([BUILD_INTROSPECTION_DATA], [test x$introspection_data = xtrue])
++
+ AC_CONFIG_FILES([
+ Makefile
+ tests/Makefile
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bdd0fa7..75dd3c9 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,6 +1,9 @@
+ include $(top_srcdir)/common.mk
+
+-SUBDIRS = . scanner repository offsets warn
++SUBDIRS = . scanner repository warn
++if BUILD_INTROSPECTION_DATA
++SUBDIRS += offsets
++endif
+
+ EXTRA_DIST=
+ BUILT_SOURCES=
+--
+2.7.0
+
diff --git a/package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
new file mode 100644
index 0000000000..0fd2299f98
--- /dev/null
+++ b/package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
@@ -0,0 +1,52 @@
+From 704b888d0abfb01067352c40156f49f655691c7c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 19 Oct 2015 18:26:40 +0300
+Subject: [PATCH] giscanner: add --use-binary-wrapper option
+
+With this option, giscanner will use a wrapper executable to run
+binaries it's producing, instead of running them directly. This
+is useful when binaries are cross-compiled and cannot be run directly,
+but they can be run using for example QEMU emulation.
+
+Upstream-Status: Pending [review on oe-core list]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/scannermain.py | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 633496f..d684cd0 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -124,6 +124,9 @@ def _get_option_parser():
+ parser.add_option("", "--program",
+ action="store", dest="program", default=None,
+ help="program to execute")
++ parser.add_option("", "--use-binary-wrapper",
++ action="store", dest="wrapper", default=None,
++ help="wrapper to use for running programs (useful when cross-compiling)")
+ parser.add_option("", "--program-arg",
+ action="append", dest="program_args", default=[],
+ help="extra arguments to program")
+@@ -419,6 +422,17 @@ def create_binary(transformer, options, args):
+ gdump_parser.get_error_quark_functions())
+
+ shlibs = resolve_shlibs(options, binary, options.libraries)
++ if options.wrapper:
++ # The wrapper needs the binary itself, not the libtool wrapper script,
++ # so we check if libtool has sneaked the binary into .libs subdirectory
++ # and adjust the path accordingly
++ import os.path
++ dir_name, binary_name = os.path.split(binary.args[0])
++ libtool_binary = os.path.join(dir_name, '.libs', binary_name)
++ if os.path.exists(libtool_binary):
++ binary.args[0] = libtool_binary
++ # Then prepend the wrapper to the command line to execute
++ binary.args = [options.wrapper] + binary.args
+ gdump_parser.set_introspection_binary(binary)
+ gdump_parser.parse()
+ return shlibs
+--
+2.7.0
+
diff --git a/package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch b/package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
new file mode 100644
index 0000000000..97880ef51d
--- /dev/null
+++ b/package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
@@ -0,0 +1,48 @@
+From d4ad57fd4a32c4f0d2f0522a3090ef940746431b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 30 Oct 2015 16:28:46 +0200
+Subject: [PATCH] giscanner: add a --use-ldd-wrapper option
+
+This is useful in cross-compile environments where system's ldd
+command does not work on binaries built for a different architecture
+
+Upstream-Status: Pending [review in oe-core]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/scannermain.py | 3 +++
+ giscanner/shlibs.py | 4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index d684cd0..1b3b369 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -127,6 +127,9 @@ def _get_option_parser():
+ parser.add_option("", "--use-binary-wrapper",
+ action="store", dest="wrapper", default=None,
+ help="wrapper to use for running programs (useful when cross-compiling)")
++ parser.add_option("", "--use-ldd-wrapper",
++ action="store", dest="ldd_wrapper", default=None,
++ help="wrapper to use instead of ldd (useful when cross-compiling)")
+ parser.add_option("", "--program-arg",
+ action="append", dest="program_args", default=[],
+ help="extra arguments to program")
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index c93d20c..c5b5942 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -105,7 +105,9 @@ def _resolve_non_libtool(options, binary, libraries):
+ args.extend(libtool)
+ args.append('--mode=execute')
+ platform_system = platform.system()
+- if platform_system == 'Darwin':
++ if options.ldd_wrapper:
++ args.extend([options.ldd_wrapper, binary.args[0]])
++ elif platform_system == 'Darwin':
+ args.extend(['otool', '-L', binary.args[0]])
+ else:
+ args.extend(['ldd', binary.args[0]])
+--
+2.7.0
+
diff --git a/package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch b/package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch
new file mode 100644
index 0000000000..5539b467a9
--- /dev/null
+++ b/package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch
@@ -0,0 +1,39 @@
+From 08ee7e704d3ebbb783e26768074a5969d6843204 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Wed, 18 Oct 2017 17:31:19 -0400
+Subject: [PATCH] add PYTHON_INCLUDES override
+
+As the configure script mixes up host/target python. Equivalent to the
+similar code in dbus-python.
+
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+---
+ m4/python.m4 | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/m4/python.m4 b/m4/python.m4
+index ed5559d..9853263 100644
+--- a/m4/python.m4
++++ b/m4/python.m4
+@@ -43,7 +43,17 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-PYTHON_INCLUDES=`$PYTHON-config --includes`
++if test "${PYTHON_INCLUDES+set}" = set; then
++ AC_MSG_NOTICE([PYTHON_INCLUDES overridden to: $PYTHON_INCLUDES])
++else
++ if test -x "$PYTHON_CONFIG"; then
++ PYTHON_INCLUDES=`$PYTHON_CONFIG --includes 2>/dev/null`
++ else
++ PYTHON_INCLUDES=`$PYTHON -c "import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_inc(True))"`
++ PYTHON_INCLUDES="-I$PYTHON_INCLUDES"
++ fi
++fi
++
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+ save_CPPFLAGS="$CPPFLAGS"
+--
+2.13.6
+
diff --git a/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
new file mode 100644
index 0000000000..4ec527dcc0
--- /dev/null
+++ b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
@@ -0,0 +1,73 @@
+From e48f1e18f5ea41656f0ba10fe61d69d2604b0064 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 3 Jan 2018 17:02:01 +0200
+Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
+
+By default LD_LIBRARY_PATH is set to the list of target library paths;
+this breaks down in cross-compilation environment, as we need to run a
+native emulation wrapper rather than the target binary itself. This patch
+allows exporting those paths to a different environment variable
+which can be picked up and used by the wrapper.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+---
+ giscanner/ccompiler.py | 4 ++--
+ giscanner/dumper.py | 3 ++-
+ giscanner/scannermain.py | 3 +++
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
+index 29de0ee..928eae8 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -109,7 +109,7 @@ class CCompiler(object):
+
+ self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations"
+
+- def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths):
++ def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths, lib_dirs_envvar):
+ # An "internal" link is where the library to be introspected
+ # is being built in the current directory.
+
+@@ -119,7 +119,7 @@ class CCompiler(object):
+ if self.check_is_msvc():
+ runtime_path_envvar = ['LIB', 'PATH']
+ else:
+- runtime_path_envvar = ['LD_LIBRARY_PATH']
++ runtime_path_envvar = ['LD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
+ # Search the current directory first
+ # (This flag is not supported nor needed for Visual C++)
+ args.append('-L.')
+diff --git a/giscanner/dumper.py b/giscanner/dumper.py
+index 7f77bd2..db96df6 100644
+--- a/giscanner/dumper.py
++++ b/giscanner/dumper.py
+@@ -259,7 +259,8 @@ class DumpCompiler(object):
+ libtool,
+ self._options.libraries,
+ self._options.extra_libraries,
+- self._options.library_paths)
++ self._options.library_paths,
++ self._options.lib_dirs_envvar)
+ args.extend(pkg_config_libs)
+
+ else:
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 38a45c1..b603850 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -130,6 +130,9 @@ def _get_option_parser():
+ parser.add_option("", "--use-ldd-wrapper",
+ action="store", dest="ldd_wrapper", default=None,
+ help="wrapper to use instead of ldd (useful when cross-compiling)")
++ parser.add_option("", "--lib-dirs-envvar",
++ action="store", dest="lib_dirs_envvar", default=None,
++ help="environment variable to write a list of library directories to (for running the transient binary), instead of standard LD_LIBRARY_PATH")
+ parser.add_option("", "--program-arg",
+ action="append", dest="program_args", default=[],
+ help="extra arguments to program")
+--
+2.15.1
+
diff --git a/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
new file mode 100644
index 0000000000..02fcdbeb25
--- /dev/null
+++ b/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
@@ -0,0 +1,29 @@
+From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Wed, 14 Mar 2018 12:07:10 -0400
+Subject: [PATCH] Add rpath links to ccompiler
+
+This patch allows gobject-introspection to process extra paths passed to the
+compiler via the GIR_EXTRA_LIBS_PATH variable.
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/ccompiler.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
+index a8bd5b1..51bb9bc 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -163,6 +163,8 @@ class CCompiler(object):
+
+ for envvar in runtime_path_envvar:
+ if envvar in os.environ:
++ for envvar_path in os.environ[envvar].split(':'):
++ args.append("-Wl,-rpath-link," + envvar_path)
+ os.environ[envvar] = \
+ os.pathsep.join(runtime_paths + [os.environ[envvar]])
+ else:
+--
+2.14.3
+
diff --git a/package/gobject-introspection/0008-add-Float128.patch b/package/gobject-introspection/0008-add-Float128.patch
new file mode 100644
index 0000000000..661affda34
--- /dev/null
+++ b/package/gobject-introspection/0008-add-Float128.patch
@@ -0,0 +1,28 @@
+scanner: Add _Float128
+
+The ISO/IEC TS 18661-3:2015 standard added new floating point types to
+the C standard.
+
+Newer versions of the GNU C library started exposing `_Float128` in the
+headers, which means we need to add this type to the known tokens, to
+avoid warnings.
+
+original commit:
+https://github.com/GNOME/gobject-introspection/commit/8cf3e8e5cf6d0d49db359f50c6eb0bc9ca22fbef
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+
+diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
+index 7dbab5c8..218024e9 100644
+--- a/giscanner/scannerlexer.l
++++ b/giscanner/scannerlexer.l
+@@ -192,7 +192,7 @@ stringtext ([^\\\"])|(\\.)
+ "__stdcall" { /* ignore */ }
+ "__w64" { /* ignore */ }
+ "__int64" { return INT; }
+-
++"_Float128" { return FLOAT; }
+
+ "G_GINT64_CONSTANT" { return INTL_CONST; }
+ "G_GUINT64_CONSTANT" { return INTUL_CONST; }
diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in
new file mode 100644
index 0000000000..fccdc0a936
--- /dev/null
+++ b/package/gobject-introspection/Config.in
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_GOBJECT_INTROSPECTION
+ bool "gobject-introspection"
+ depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libffi, libglib2
+ depends on BR2_TOOLCHAIN_USES_GLIBC
+ depends on BR2_USE_MMU # python3, libglib2
+ depends on BR2_USE_WCHAR # python3, libglib2 -> gettext
+ depends on !BR2_STATIC_LIBS
+ depends on !BR2_MIPS_NABI32
+ select BR2_PACKAGE_LIBFFI
+ select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_HOST_QEMU
+ select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
+ select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
+ help
+ GObject introspection is a middleware layer between C
+ libraries (using GObject) and language bindings. The C library
+ can be scanned at compile time and generate a metadata file,
+ in addition to the actual native C library. Then at runtime,
+ language bindings can read this metadata and automatically
+ provide bindings to call into the C library.
+
+ https://wiki.gnome.org/action/show/Projects/GObjectIntrospection
+
+comment "gobject-introspection needs a glibc toolchain w/ wchar, threads, dynamic library"
+ depends on BR2_USE_MMU
+ depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/gobject-introspection/cross-ldd b/package/gobject-introspection/cross-ldd
new file mode 100644
index 0000000000..ef2ca20f39
--- /dev/null
+++ b/package/gobject-introspection/cross-ldd
@@ -0,0 +1,362 @@
+#!/bin/bash
+
+# ldd drop-in replacement for cross-compilation toolchains.
+
+# This file is a slightly modified version of xldd.in from
+# crosstool-ng 1.22.0
+
+# In order to use it, copy it in same directory than other
+# toolchain binaries and rename it with same tuple.
+# (i.e. /opt/arm-sysmic-linux-gnueabihf/bin/arm-sysmic-linux-gnueabihf-ldd)
+# Thus, this will automaticaly detect necessary information
+# about your toolchain.
+
+export LC_ALL=C
+version="forked from crosstool-ng 1.22.0"
+# Change it to 64 if necessary
+bits="32"
+sed="${SED:-sed}"
+grep="${GREP:-grep}"
+
+my_name="$( basename "${0}" )"
+prefix="${0%-ldd}"
+gcc="${prefix}-gcc"
+readelf="${prefix}-readelf"
+fake_load_addr_root="$((0xdeadbeef))"
+fake_load_addr_rpath="$((0xdeadc0de))"
+fake_load_addr_sysroot="$((0x8badf00d))"
+ld_library_path="/lib:/usr/lib"
+
+do_error() {
+ printf "%s: %s\n" "${my_name}" "$*" >&2
+}
+
+do_opt_error() {
+ do_error "$@"
+ printf "Try \`%s --help' for more information\n" "${my_name}" >&2
+}
+
+do_trace() {
+ local depth=0
+
+ [ -z "${CT_XLDD_VERBOSE}" ] && return 0
+
+ for((depth=0; "${#FUNCNAME[$((depth+1))]}" != 0; depth++)); do :; done
+ printf "%*s" $((4*(depth-1))) "" >&2
+ printf -- "$@" >&2
+}
+
+show_version() {
+ # Fake a real ldd, just in case some dumb script would check
+ cat <<_EOF_
+ldd (crosstool-NG) ${version}
+Copyright (C) 2010 "Yann E. MORIN" <yann.morin.1998@free.fr>
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+Licensed under the GPLv2, see the file LICENSES in the top-directory of the
+sources for this package.
+_EOF_
+}
+
+show_help() {
+ cat <<_EOF_
+Usage: ${my_name} [OPTION]... --root DIR FILE...
+ --help print this help and exit
+ --version print version information and exit
+ --root dir treat dir as being the root of the target
+ -s, --show-system mark libs from the sysroot with a trailing '[*]'
+ and libs found via RPATH with a trailing '[+]'
+
+_EOF_
+ cat <<_EOF_ |fmt
+${my_name} tries to mimick the behavior of a real native ldd, but can be
+used in a cross-development environment. Here is how it differs from a
+real native ldd:
+
+If the CT_XLDD_VERBOSE variable is set and non-empty, then ${my_name} will
+print a lot of debug messages, explaining how it builds the library
+search path, and how each library was found and why.
+
+The LD_LIBRARY_PATH variable is not used, as it can not reliably be
+guessed except@runtime, and we can't run.
+
+${my_name} does not scan /etc/ld.so.cache, but instead uses /etc/ld.so.conf
+(it understands the include directives therein for libces that have that).
+
+${my_name} also interprets (tries to!) the RPATH/RUNPATH records found in
+the dynamic ELF section. Such paths are searched for only relative to
+the specified root, not from the sysroot (see below). Also, those paths
+are searched for not only for the file they appear in, but also for its
+dependencies.
+
+${my_name} will search the directory specified with --root for libraries
+to resolve the NEEDED tags. If --root is not set, then ${my_name} will
+use the value in the environment variable \${CT_XLDD_ROOT}. If neither
+is set, then this is an error.
+
+If NEEDED libraries can't be found in the specified root directory, then
+${my_name} will also look in the sysroot of the toolchain to see if it
+can find them.
+
+For NEEDED libraries that were found, the output will look like:
+ libneeded.so => /path/to/libneeded.so (0xloadaddr)
+
+and for those that were not found, the output will look like:
+ libneeded.so not found
+
+The paths are relative to the specified root directory, or to the sysroot
+(eg. /lib/libneeded.so, /usr/lib/libneeded.so, and so on...).
+
+The expected load address 'loadaddr' is a faked address to match the output
+of the real ldd, but has no actual meaning (set to some constants for now,
+0x8badf00d for libraries from the sysroot, 0xdeadc0de for those found via
+the RPATH/RUNPATH records, and 0xdeadbeef for others).
+_EOF_
+
+# Unimplemeted yet:
+# -d, --data-relocs process data relocations
+# -r, --function-relocs process data and function relocations
+# -u, --unused print unused direct dependencies
+# -v, --verbose print all information
+
+# See also this thread:
+# http://sourceware.org/ml/crossgcc/2008-09/msg00057.html
+}
+
+# Parse command line options
+root="${CT_XLDD_ROOT}"
+show_system=
+while true; do
+ case "${1}" in
+ --help)
+ show_help
+ exit 0
+ ;;
+ --version)
+ show_version
+ exit 0
+ ;;
+ --root)
+ root="$2"
+ shift
+ ;;
+ --root=*)
+ root="${1#--root=}"
+ ;;
+ --show-system|-s)
+ show_system=1
+ ;;
+ -*)
+ do_opt_error "unrecognized option \`${1}'"
+ exit 1
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+done
+
+# Sanity checks
+sysroot="$( "${gcc}" -print-sysroot 2>/dev/null )"
+if [ -z "${sysroot}" ]; then
+ sysroot="$( "${gcc}" -print-file-name=libc.so 2>/dev/null \
+ |${sed} -r -e 's:/usr/lib/libc.so$::;' \
+ )"
+fi
+if [ -z "${sysroot}" ]; then
+ do_error "unable to find sysroot for \`${gcc}'"
+fi
+
+if [ -z "${root}" ]; then
+ root=${sysroot}
+fi
+if [ ! -d "${root}" ]; then
+ do_error "\`${root}': no such file or directory"
+ exit 1
+fi
+
+do_report_needed_found() {
+ local needed="${1}"
+ local path="${2}"
+ local origin="${3}"
+ local loadaddr
+ local sys
+
+ case "${origin}" in
+ root)
+ loadaddr="${fake_load_addr_root}"
+ ;;
+ rpath)
+ loadaddr="${fake_load_addr_rpath}"
+ if [ -n "${show_system}" ]; then
+ sys=" [+]"
+ fi
+ ;;
+ sysroot)
+ loadaddr="${fake_load_addr_sysroot}"
+ if [ -n "${show_system}" ]; then
+ sys=" [*]"
+ fi
+ ;;
+ esac
+
+ printf "%8s%s => %s (0x%0*x)%s\n" \
+ "" \
+ "${needed}" \
+ "${path}" \
+ "$((bits/4))" \
+ "${loadaddr}" \
+ "${sys}"
+}
+
+# Search a needed file, scanning ${lib_dir} in the root directory
+do_find_needed() {
+ local needed="${1}"
+ local -a list
+ local -a dirs
+ local found
+ local where
+ local base
+ local d i
+
+ do_trace "Searching for '%s'\n" "${needed}"
+
+ # rpath shall come first!
+ list=( \
+ "rpath:${root}" \
+ "root:${root}" \
+ "sysroot:${sysroot}" \
+ )
+
+ for i in "${list[@]}"; do
+ where="${i%%:*}"
+ base="${i#*:}"
+ if [ "${where}" = "rpath" ]; then
+ dirs=( "${search_rpath[@]}" )
+ else
+ dirs=( "${needed_search_path[@]}" )
+ fi
+ for d in "${dirs[@]}"; do
+ do_trace "-> looking in '%s' (%s)\n" "${d}" "${where}"
+ if [ -f "${base}${d}/${needed}" ]; then
+ found="${d}/${needed}"
+ do_trace "---> found\n"
+ break 2
+ fi
+ done
+ done
+
+ if [ -n "${found}" ]; then
+ do_report_needed_found "${needed}" "${found}" "${where}"
+ do_process_file "${base}${found}"
+ else
+ printf "%8s%s not found\n" "" "${needed}"
+ fi
+
+ do_trace "Done searching for '%s'\n" "${needed}"
+}
+
+# Scan a file for all NEEDED tags
+do_process_file() {
+ local file="${1}"
+ local -a save_search_rpath
+ local n m
+ local found
+
+ do_trace "Parsing file '%s'\n" "${file}"
+
+ save_search_rpath=( "${search_rpath[@]}" )
+ for n in $( "${readelf}" -d "${file}" \
+ |"${grep}" -E '\((RPATH|RUNPATH)\)' \
+ |"${sed}" -r -e 's/^.*Library r(|un)path:[[:space:]]+\[(.*)\]$/\2/;'\
+ ); do
+ do_trace "-> adding rpath '%s'\n" "${n}"
+ search_rpath+=( "${n}" )
+ done
+ do_trace ": search path:\n"
+ for n in "${search_rpath[@]}" "${needed_search_path[@]}"; do
+ do_trace ": - '%s'\n" "${n}"
+ done
+ do_trace ": end search path\n"
+
+ for n in $( "${readelf}" -d "${file}" \
+ |"${grep}" -E '\(NEEDED\)' \
+ |"${sed}" -r -e 's/^.*Shared library:[[:space:]]+\[([^]]+)\].*/\1/;' \
+ ); do
+ found=0
+ for m in "${needed_list[@]}"; do
+ [ "${n}" = "${m}" ] && found=1 && break
+ done
+ if [ ${found} -ne 0 ]; then
+ do_trace "-> skipping already known dependency '%s'\n" "${n}"
+ continue
+ fi
+ do_trace "-> handling new dependency '%s'\n" "${n}"
+ needed_list+=( "${n}" )
+ do_find_needed "${n}"
+ do_trace "-> done handling dependency '%s'\n" "${n}"
+ done
+
+ search_rpath=( "${save_search_rpath[@]}" )
+
+ do_trace "Finished parsing file '%s'\n" "${file}"
+}
+
+# Recursively scan a /etc/ld.so.conf file
+do_scan_etc_ldsoconf() {
+ local ldsoconf="${1}"
+ local g
+ local f
+
+ [ -f "${ldsoconf}" ] || return 0
+ do_trace "Parsing ld.so.conf: '%s'\n" "${ldsoconf}"
+
+ while read line; do
+ case "${line}" in
+ include\ *)
+ g="${root}${line#include }"
+ do_trace "-> handling include directive '%s'\n" "${g}"
+ for f in ${g}; do
+ do_scan_etc_ldsoconf "${f}"
+ done
+ do_trace "-> finished handling include directive '%s'\n" "${g}"
+ ;;
+ \#*|"")
+ ;;
+ *)
+ do_trace "-> adding search dir '%s'\n" "${line}"
+ needed_search_path+=( "${line}" )
+ ;;
+ esac
+ done <"${ldsoconf}"
+
+ do_trace "Finished parsing ld.so.conf: '%s'\n" "${ldsoconf}"
+}
+
+# Build up the full list of search directories
+declare -a needed_search_path
+do_trace "Adding basic lib dirs\n"
+ld_library_path="${ld_library_path}:"
+while [ -n "${ld_library_path}" ]; do
+ d="${ld_library_path%%:*}"
+ if [ -n "${d}" ]; then
+ do_trace "-> adding search dir '%s'\n" "${d}"
+ needed_search_path+=( "${d}" )
+ fi
+ ld_library_path="${ld_library_path#*:}"
+done
+do_trace "Done adding basic lib dirs\n"
+do_trace "Scanning '/etc/ld.so.conf'\n"
+do_scan_etc_ldsoconf "${root}/etc/ld.so.conf"
+do_trace "Done scanning '/etc/ld.so.conf'\n"
+do_trace "Search path:\n"
+for p in "${needed_search_path[@]}"; do
+ do_trace "-> '%s'\n" "${p}"
+done
+
+declare -a needed_list
+declare -a search_rpath
+do_trace "Scanning file '%s'\n" "${1}"
+do_process_file "${1}"
+do_trace "Done scanning file '%s'\n" "${1}"
diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in
new file mode 100644
index 0000000000..b2f97ea870
--- /dev/null
+++ b/package/gobject-introspection/g-ir-compiler.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+$STAGING_DIR/usr/bin/g-ir-scanner-qemuwrapper $STAGING_DIR/usr/bin/g-ir-compiler.real "$@"
diff --git a/package/gobject-introspection/g-ir-scanner-lddwrapper.in b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
new file mode 100644
index 0000000000..3313c877f8
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+${TARGET_CROSS}ldd "$@"
diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
new file mode 100644
index 0000000000..aae36a1fa9
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Use a modules directory which does not exist so we don't load random things
+# which may then get deleted (or their dependencies) and potentially segfault
+export GIO_MODULE_DIR=$STAGING_DIR/usr/lib/gio/modules-dummy
+PSEUDO_UNLOAD=1 $HOST_DIR/bin/qemu- at HOST_QEMU_ARCH@ @HOST_QEMU_CPU_TUNE@ -r @TOOLCHAIN_HEADERS_VERSION@ -L $STAGING_DIR -E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:$STAGING_DIR/usr/lib:$STAGING_DIR/lib "$@"
+if [[ $? -ne 0 ]]; then
+ echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help."
+ echo '(typically like this: GIR_EXTRA_LIBS_PATH="$(@D)/.libs")'
+ exit 1
+fi
diff --git a/package/gobject-introspection/g-ir-scanner.in b/package/gobject-introspection/g-ir-scanner.in
new file mode 100644
index 0000000000..71b1871cfd
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+export GI_SCANNER_DISABLE_CACHE=1
+$HOST_DIR/bin/g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=$STAGING_DIR/usr/bin/g-ir-scanner-qemuwrapper --use-ldd-wrapper=$STAGING_DIR/usr/bin/g-ir-scanner-lddwrapper --add-include-path=$STAGING_DIR/usr/share/gir-1.0 "$@"
diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash
new file mode 100644
index 0000000000..a41fb58a5f
--- /dev/null
+++ b/package/gobject-introspection/gobject-introspection.hash
@@ -0,0 +1,4 @@
+#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.54/gobject-introspection-1.54.1.sha256sum
+sha256 b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e gobject-introspection-1.54.1.tar.xz
+sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL
diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
new file mode 100644
index 0000000000..fe55da0b99
--- /dev/null
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -0,0 +1,90 @@
+################################################################################
+#
+# gobject-introspection
+#
+################################################################################
+
+GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.54
+GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).1
+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_DEPENDENCIES = libffi zlib libglib2 host-qemu host-gobject-introspection
+GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
+GOBJECT_INTROSPECTION_AUTORECONF = YES
+GOBJECT_INTROSPECTION_LICENSE = Dual LGPLv2+/GPLv2+
+GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL
+HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = host-libglib2 host-flex host-bison
+
+GOBJECT_INTROSPECTION_CONF_OPTS = \
+ --enable-host-gi \
+ --disable-static \
+ --enable-gi-cross-wrapper=$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper \
+ --enable-gi-ldd-wrapper=$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper \
+ --disable-introspection-data
+
+ifeq ($(BR2_PACKAGE_CAIRO),y)
+GOBJECT_INTROSPECTION_DEPENDENCIES += cairo
+endif
+ifeq ($(BR2_PACKAGE_LIBFFI),y)
+GOBJECT_INTROSPECTION_DEPENDENCIES += libffi
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+GOBJECT_INTROSPECTION_DEPENDENCIES += python
+HOST_GOBJECT_INTROSPECTION_DEPENDENCIES += host-python
+GOBJECT_INTROSPECTION_PYTHON_PATH="$(STAGING_DIR)/usr/bin/python2"
+else
+GOBJECT_INTROSPECTION_DEPENDENCIES += python3
+HOST_GOBJECT_INTROSPECTION_DEPENDENCIES += host-python3
+GOBJECT_INTROSPECTION_PYTHON_PATH="$(STAGING_DIR)/usr/bin/python3"
+endif
+
+# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to $HOME
+GOBJECT_INTROSPECTION_CONF_ENV = \
+ GI_SCANNER_DISABLE_CACHE=1 \
+ GIR_EXTRA_LIBS_PATH=$(@D)/.libs \
+ PYTHON_INCLUDES="`$(GOBJECT_INTROSPECTION_PYTHON_PATH)-config --includes`"
+
+# Make sure g-ir-tool-template uses the host python.
+define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+ sed -i -e '1s,#!.*,#!$(HOST_DIR)/bin/python,' $(@D)/tools/g-ir-tool-template.in
+endef
+GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS = GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS = GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+
+GOBJECT_INTROSPECTION_WRAPPERS = \
+ g-ir-compiler \
+ g-ir-scanner
+
+# In order for gobject-introspection to work, qemu needs to run temporarily
+# to create binaries on the fly by g-ir-scanner. This involves creating
+# several wrapper scripts to accomplish the task:
+# g-ir-scanner-qemuwrapper, g-ir-compiler-wrapper,
+# g-ir-scanner-lddwrapper, g-ir-scanner-wrapper, g-ir-compiler-wrapper, and
+# finally a cross-ldd.
+define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
+ # Move the real binaries to their names.real, then replace them with
+ # the wrappers.
+ $(foreach w,$(GOBJECT_INTROSPECTION_WRAPPERS),
+ mv $(STAGING_DIR)/usr/bin/$(w) $(STAGING_DIR)/usr/bin/$(w).real
+ $(INSTALL) -D -m 755 \
+ package/gobject-introspection/$(w).in $(STAGING_DIR)/usr/bin/$(w)
+ )
+ $(INSTALL) -D -m 755 package/gobject-introspection/cross-ldd $(TARGET_CROSS)ldd
+ $(INSTALL) -D -m 755 package/gobject-introspection/g-ir-scanner-lddwrapper.in $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper
+ $(INSTALL) -D -m 755 package/gobject-introspection/g-ir-scanner-qemuwrapper.in $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+ $(SED) "s|@HOST_QEMU_ARCH@|$(HOST_QEMU_ARCH)|g" $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+ $(SED) "s|@HOST_QEMU_CPU_TUNE@|$(HOST_QEMU_CPU_TUNE)|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
+ $(SED) "s at g_ir_scanner=.*@g_ir_scanner=$(STAGING_DIR)/usr/bin/g-ir-scanner at g" \
+ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
+
+ # The pkgconfig file needs to point towards the wrappers instead of the native
+ # binaries.
+ $(SED) "s at g_ir_compiler=.*@g_ir_compiler=$(STAGING_DIR)/usr/bin/g-ir-compiler at g" \
+ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
+endef
+GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS = GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 45de99356f..06021f95c1 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -162,6 +162,7 @@ endif
$(2)_CONF_ENV ?=
$(2)_CONF_OPTS ?=
+$(2)_GIR_EXTRA_LIBS_PATH ?=
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
$(2)_INSTALL_OPTS ?= install
@@ -239,6 +240,8 @@ endef
endif
endif
+export GIR_EXTRA_LIBS_PATH=$$($$(PKG)_GIR_EXTRA_LIBS_PATH)
+
$(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
ifeq ($$($(2)_AUTORECONF),YES)
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v4 4/4] gstreamer1 packages: add support for introspection
2018-03-14 17:24 [Buildroot] [PATCH v4 0/4] gobject-introspection: new series Adam Duskett
` (2 preceding siblings ...)
2018-03-14 17:24 ` [Buildroot] [PATCH v4 3/4] gobject-introspection: new package Adam Duskett
@ 2018-03-14 17:24 ` Adam Duskett
3 siblings, 0 replies; 9+ messages in thread
From: Adam Duskett @ 2018-03-14 17:24 UTC (permalink / raw)
To: buildroot
Now that there is support for gobject-introspection, we can add the appropriate
configuration options to support compiling against gobject-introspection.
gst1-plugins-base requires a patch to drop a incorrect reference to
sdp when compiling the rtsp gir file.
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
Changes v1 -> v4:
- Add patch to series.
.../gst1-plugins-bad/gst1-plugins-bad.mk | 5 ++++
...ncorrect-reference-to-gstreamer-sdp-in-Ma.patch | 28 ++++++++++++++++++++++
.../gst1-plugins-base/gst1-plugins-base.mk | 5 ++++
package/gstreamer1/gstreamer1/gstreamer1.mk | 6 +++++
4 files changed, 44 insertions(+)
create mode 100644 package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 595e62072c..44b65bcf5d 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -64,6 +64,11 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-introspection=yes
+GST1_PLUGINS_BAD_GIR_EXTRA_LIBS_PATH=$(@D)/gst-libs/gst/allocators/.libs
+endif
+
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
# RPI has odd locations for several required headers.
GST1_PLUGINS_BAD_CONF_ENV += \
diff --git a/package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
new file mode 100644
index 0000000000..71d9732604
--- /dev/null
+++ b/package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
@@ -0,0 +1,28 @@
+From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 26 Oct 2015 17:30:14 +0200
+Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in
+ Makefile.am
+
+Upstream-Status: Pending [review on oe-core maillist]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ gst-libs/gst/rtsp/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
+index 4f6d9f8..0afa370 100644
+--- a/gst-libs/gst/rtsp/Makefile.am
++++ b/gst-libs/gst/rtsp/Makefile.am
+@@ -75,7 +75,6 @@ GstRtsp- at GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp- at GST_API_VERS
+ --libtool="$(LIBTOOL)" \
+ --pkg gio-2.0 \
+ --pkg gstreamer- at GST_API_VERSION@ \
+- --pkg gstreamer-sdp- at GST_API_VERSION@ \
+ --pkg-export gstreamer-rtsp- at GST_API_VERSION@ \
+ --add-init-section="$(INTROSPECTION_INIT)" \
+ --output $@ \
+--
+2.6.2
+
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index f492c4a175..0c474b921c 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -25,6 +25,11 @@ GST1_PLUGINS_BASE_CONF_OPTS += \
GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-introspection=yes
+GST1_PLUGINS_BASE_GIR_EXTRA_LIBS_PATH=$(@D)/gst-libs/gst/tag/.libs:$(@D)/gst-libs/gst/video/.libs:$(@D)/gst-libs/gst/audio/.libs:$(@D)/gst-libs/gst/rtp/.libs
+endif
+
# These plugins are liste in the order from ./configure --help
ifeq ($(BR2_PACKAGE_ORC),y)
diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index 25a799240d..1731d25957 100644
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -32,4 +32,10 @@ GSTREAMER1_DEPENDENCIES = \
libglib2 \
$(if $(BR2_PACKAGE_LIBUNWIND),libunwind)
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+GSTREAMER1_DEPENDENCIES += gobject-introspection
+GSTREAMER1_CONF_OPTS += --enable-introspection=yes
+GSTREAMER1_GIR_EXTRA_LIBS_PATH += GIR_EXTRA_LIBS_PATH="$(@D)/gst/.libs:$(@D)/libs/gst/base/.libs"
+endif
+
$(eval $(autotools-package))
--
2.14.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection
2018-03-14 17:24 ` [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection Adam Duskett
@ 2018-03-14 18:02 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2018-03-14 18:02 UTC (permalink / raw)
To: buildroot
Adam, All,
On 2018-03-14 13:24 -0400, Adam Duskett spake thusly:
> Add a BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS which will be referenced by the
> gobject-introspection package. This also has the added benefit of making the
> config file conform to other package standards such as Valgrind.
>
> Add depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970 to
> Config.in.host as these are not currently supported cpus by qemu.
>
> Add a new variable in qemu.mk: HOST_QEMU_CPU_TUNE. When qemu-$(ARCH) is
> called, some architectures require a -cpu flag to be passed, or else a
> segfault may occure when building .gir files.
> For PowerPC, many of these cpu's need a specific CPU flag to be passed
> via the command line.
I think you should split this patch in two:
- one to introduce BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
- one to introduce HOST_QEMU_CPU_TUNE
The second of which I have more comment about, see below...
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
[--SNIP--]
> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
> index 345ef52668..62cb517628 100644
> --- a/package/qemu/qemu.mk
> +++ b/package/qemu/qemu.mk
> @@ -70,6 +70,37 @@ endif
> ifeq ($(HOST_QEMU_ARCH),sh4aeb)
> HOST_QEMU_ARCH = sh4eb
> endif
> +
> +# Add cpu specific callouts for qemu.
> +# In some cases (e.g. ppc) simply being arch specific (apparently) isn't good
> +# enough and a PACKAGE_ARCH specific -cpu option is needed
> +# For others (e.g. arm) a -cpu option is not necessary, since the
> +# qemu-arm default CPU supports all required architecture levels.
> +ifeq ($(BR2_x86_64),y)
> +HOST_QEMU_CPU_TUNE = -cpu Nehalem,check=false
> +endif
> +
> +# PowerPC architecture. Currently, the 620, 630, and 970 are not supported.
> +ifeq ($(BR2_powerpc_e5500),y)
> +HOST_QEMU_CPU_TUNE = -cpu e5500
> +endif
> +
> +ifeq ($(BR2_powerpc_e6500),y)
> +HOST_QEMU_CPU_TUNE = -cpu e6500
> +endif
> +
> +ifeq ($(BR2_powerpc_power7),y)
> +HOST_QEMU_CPU_TUNE = -cpu 7400
> +endif
> +
> +ifeq ($(BR2_powerpc64)$(BR2_powerpc_e5500),yy)
> +HOST_QEMU_CPU_TUNE = -cpu e500mc
> +endif
> +
> +ifeq ($(BR2_powerpc64)$(BR2_powerpc_e6500),yy)
> +HOST_QEMU_CPU_TUNE = -cpu e500mc
> +endif
So, as I understand it, pacakges that will want to use qemu will have to
call it with those options, like so:
define FOO_BLABLA_HOOK
qemu $(HOST_QEMU_CPU_TUNE) blabla...
endef
Wat I would suggest is that you rename this variable, and change the way
QEMU_USER is defined, on line 150:
QEMU_USER_OPTS += -cpu blurk
QEMU_USER = $(HOST_DIR)/bin/qemu-$(HOST_QEMU_ARCH) $(QEMU_USER_OPTS)
Then, when a package wants to use qemu-user, it just has to call
$(QEMU_USER).
Regards,
Yann E. MORIN.
> HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH)
>
> ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y)
> --
> 2.14.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v4 2/4] gstreamer1 packages: explicitly disable introspection
2018-03-14 17:24 ` [Buildroot] [PATCH v4 2/4] gstreamer1 packages: explicitly disable introspection Adam Duskett
@ 2018-03-14 18:05 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2018-03-14 18:05 UTC (permalink / raw)
To: buildroot
Adam, All,
On 2018-03-14 13:24 -0400, Adam Duskett spake thusly:
> To get gstreamer ready for introspection, we must first explicitly
> disable gstreamer1, plugins base and plugins bad from using introspection.
> If not, when gobject-introspection is compiled, these packages will fail to
> build because the _GIR_EXTRA_LIBS_PATH variable is not set.
>
> The other gstreamer1 packages do not need the _GIR_EXTRA_LIBS_PATH variable to
> be set.
>
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> Changes v1 -> v4:
> - Add patch to series.
> - Change TARGET_MAKE_ENV += GIR_EXTRA_LIBS_PATH to
> PACKAGE_GIR_EXTRA_LIBS_PATH.
>
> package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 3 ++-
> package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 3 ++-
> package/gstreamer1/gstreamer1/gstreamer1.mk | 1 +
> 3 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> index 83cb94be81..595e62072c 100644
> --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> @@ -21,7 +21,8 @@ GST1_PLUGINS_BAD_CONF_OPTS = \
> --disable-winks \
> --disable-android_media \
> --disable-apple_media \
> - --disable-acm
> + --disable-acm \
> + --enable-introspection=no
Please explain, in the commit log, why you use --enable-introspection=no
rather than --disable-introspection.
Regards,
Yann E. MORIN.
> # Options which require currently unpackaged libraries
> GST1_PLUGINS_BAD_CONF_OPTS += \
> diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> index 10361ee3c6..f492c4a175 100644
> --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> @@ -14,7 +14,8 @@ GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+
> # gio_unix_2_0 is only used for tests
> GST1_PLUGINS_BASE_CONF_OPTS = \
> --disable-examples \
> - --disable-valgrind
> + --disable-valgrind \
> + --enable-introspection=no
>
> # Options which require currently unpackaged libraries
> GST1_PLUGINS_BASE_CONF_OPTS += \
> diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
> index ea9f29a4f3..25a799240d 100644
> --- a/package/gstreamer1/gstreamer1/gstreamer1.mk
> +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
> @@ -17,6 +17,7 @@ GSTREAMER1_CONF_OPTS = \
> --disable-failing-tests \
> --disable-valgrind \
> --disable-benchmarks \
> + --enable-introspection=no \
> $(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \
> $(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \
> $(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \
> --
> 2.14.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v4 3/4] gobject-introspection: new package
2018-03-14 17:24 ` [Buildroot] [PATCH v4 3/4] gobject-introspection: new package Adam Duskett
@ 2018-03-14 18:49 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2018-03-14 18:49 UTC (permalink / raw)
To: buildroot
Adam, All,
On 2018-03-14 13:24 -0400, Adam Duskett spake thusly:
> GObject introspection is a middleware layer between C
> libraries (using GObject) and language bindings. The C library
> can be scanned at compile time and generate a metadata file,
> in addition to the actual native C library. Then at runtime,
> language bindings can read this metadata and automatically
> provide bindings to call into the C library.
I won;t make any comment about the diff, because it is very complex, and
mostly made of patches grabbed here and there (mostly Yocto), so there
is no point in commenting them.
However, I'll just say that I'm not very happy with the commit log.
Here, you just explained what g.o.i is, but it is already part of the
Config.in help text. Thus, it is not really helpful to have it in the
commit log...
But for such a big commit, what I would have expected is explanations
about the commit, especially when the commit is big and complex. This is
very importnat for reviewrs to understand what was done. I'd like to see
how the various pieces fit together, especially the wrapper stuff et al...
This is also (mostly?) very important for the future, when we look back
at the history (git-blame & git-show) to understand why things were done
the way they are.
So, I would be very grateful if you could provide more info in this
commit log. I know this is very difficult, but it will at least document
your epic journey. ;-)
Regards,
Yann E. MORIN.
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> Changes v1 -> v2:
> - Fixed wrappers
> - Added 0007-giscanner-add-a-lib-dirs-envvar-option.patch
> - Added 0008-add-Float128.patch
>
> Changes v2 -> v3:
> - Removed Linux kernel dependency (baruch)
> - Changed $(LINUX_VERSION) to $(BR2_TOOLCHAIN_HEADERS_AT_LEAST) (baruch)
> - Changed @LINUX_VERSION@ in g-ir-scanner-qemuwrapper.in to
> @TOOLCHAIN_HEADERS_VERSION@ to match the above variable change.
> - Added BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET in Config.in
> with only BR2_arm selected for now.
> - Removed BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS in favor of the above change.
> - Added two new lines in the base Makefile which removes any remaining .gir
> or .rnc files from the target filing system, as these are not needed for
> runtime, only compile time.
>
> Changes v3 -> v4:
> - Removed RFC tag.
> - Added 0007-Add-rpath-links-to-ccompiler.patch
> - Removed config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch as it is not
> Yocto specific.
> - Added the _GIR_EXTRA_LIBS_PATH to pkg-autotools.mk. This allows package
> specific Gir libraries to be passed on to g-ir-scanner-qemuwrapper.
> - Fixed a typo in g-ir-scanner-qemuwrapper.in.
> - Remove BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET in favor of
> BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
>
> DEVELOPERS | 1 +
> Makefile | 2 +
> package/Config.in | 1 +
> ...ncomplete-upstream-attempt-at-cross-compi.patch | 50 +++
> ...c-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 203 ++++++++++++
> ...3-giscanner-add-use-binary-wrapper-option.patch | 52 +++
> ...04-giscanner-add-a-use-ldd-wrapper-option.patch | 48 +++
> .../0005-add-PYTHON_INCLUDES-override.patch | 39 +++
> ...06-giscanner-add-a-lib-dirs-envvar-option.patch | 73 +++++
> .../0007-Add-rpath-links-to-ccompiler.patch | 29 ++
> .../gobject-introspection/0008-add-Float128.patch | 28 ++
> package/gobject-introspection/Config.in | 30 ++
> package/gobject-introspection/cross-ldd | 362 +++++++++++++++++++++
> package/gobject-introspection/g-ir-compiler.in | 2 +
> .../g-ir-scanner-lddwrapper.in | 2 +
> .../g-ir-scanner-qemuwrapper.in | 10 +
> package/gobject-introspection/g-ir-scanner.in | 3 +
> .../gobject-introspection.hash | 4 +
> .../gobject-introspection/gobject-introspection.mk | 90 +++++
> package/pkg-autotools.mk | 3 +
> 20 files changed, 1032 insertions(+)
> create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
> create mode 100644 package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
> create mode 100644 package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
> create mode 100644 package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
> create mode 100644 package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch
> create mode 100644 package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
> create mode 100644 package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
> create mode 100644 package/gobject-introspection/0008-add-Float128.patch
> create mode 100644 package/gobject-introspection/Config.in
> create mode 100644 package/gobject-introspection/cross-ldd
> create mode 100644 package/gobject-introspection/g-ir-compiler.in
> create mode 100644 package/gobject-introspection/g-ir-scanner-lddwrapper.in
> create mode 100644 package/gobject-introspection/g-ir-scanner-qemuwrapper.in
> create mode 100644 package/gobject-introspection/g-ir-scanner.in
> create mode 100644 package/gobject-introspection/gobject-introspection.hash
> create mode 100644 package/gobject-introspection/gobject-introspection.mk
>
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 41e1b54d99..a15530cf6c 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -34,6 +34,7 @@ F: package/audit/
> F: package/busybox/
> F: package/checkpolicy/
> F: package/cppdb/
> +F: package/gobject-introspection/
> F: package/gstreamer1/gstreamer1/
> F: package/gstreamer1/gstreamer1-mm/
> F: package/gstreamer1/gst1-plugins-bad/
> diff --git a/Makefile b/Makefile
> index 957ba6634a..74a7600bc6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -704,6 +704,8 @@ target-finalize: $(PACKAGES)
> $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
> $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake
> find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f
> + find $(TARGET_DIR)/usr/share/ -name '*.gir' -print0 | xargs -0 rm -f
> + find $(TARGET_DIR)/usr/share/ -name '*.rnc' -print0 | xargs -0 rm -f
> find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \
> \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
> ifneq ($(BR2_PACKAGE_GDB),y)
> diff --git a/package/Config.in b/package/Config.in
> index 9cd5d9c087..eeaab00598 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1470,6 +1470,7 @@ menu "Other"
> source "package/glibmm/Config.in"
> source "package/glm/Config.in"
> source "package/gmp/Config.in"
> + source "package/gobject-introspection/Config.in"
> source "package/gsl/Config.in"
> source "package/gtest/Config.in"
> source "package/jemalloc/Config.in"
> diff --git a/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
> new file mode 100644
> index 0000000000..86ba666d24
> --- /dev/null
> +++ b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
> @@ -0,0 +1,50 @@
> +From 3a9d1e5ee0aae56fafec0beba2014c19e4ff310c Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Wed, 23 Mar 2016 17:07:28 +0200
> +Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile support
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> + common.mk | 4 ----
> + giscanner/gdumpparser.py | 6 ------
> + 2 files changed, 10 deletions(-)
> +
> +diff --git a/common.mk b/common.mk
> +index b778f7a..e26c637 100644
> +--- a/common.mk
> ++++ b/common.mk
> +@@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \
> + --add-include-path=$(top_builddir) \
> + --add-include-path=$(top_builddir)/gir
> +
> +-# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler.
> +-# Normally will be undefined but can be set (e.g. to wine or qemu)
> +-# when cross-compiling
> + INTROSPECTION_COMPILER = \
> + env PATH=".libs:$(PATH)" \
> +- $(GI_CROSS_LAUNCHER) \
> + $(top_builddir)/g-ir-compiler$(EXEEXT)
> +
> + INTROSPECTION_COMPILER_ARGS = \
> +diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
> +index 1134f33..9bdc2bc 100644
> +--- a/giscanner/gdumpparser.py
> ++++ b/giscanner/gdumpparser.py
> +@@ -162,12 +162,6 @@ blob containing data gleaned from GObject's primitive introspection."""
> + out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
> +
> + args = []
> +-
> +- # Prepend the launcher command and arguments, if defined
> +- launcher = os.environ.get('GI_CROSS_LAUNCHER')
> +- if launcher:
> +- args.extend(launcher.split())
> +-
> + args.extend(self._binary.args)
> + args.append('--introspect-dump=%s,%s' % (in_path, out_path))
> +
> +--
> +2.7.0
> +
> diff --git a/package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
> new file mode 100644
> index 0000000000..ef57c67de7
> --- /dev/null
> +++ b/package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
> @@ -0,0 +1,203 @@
> +From b1503fe2693d602b3e24e4b832dc0934960d5d22 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Mon, 19 Oct 2015 18:29:21 +0300
> +Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper and introspection-data options
> +
> +With the first option, gobject-introspection tools (g-ir-doc-tool and g-ir-scanner)
> +that are already installed in the host system will be used for building the source tree.
> +
> +With the second option, g-ir-scanner will be instructed to use an executable
> +wrapper to run binaries it's producing, and g-ir-compiler will be run
> +through the same wrapper (host system's g-ir-compiler cannot be used because
> +it's producing architecture-specific output).
> +
> +With the third option, giscanner will be instructed to use a special ldd
> +command instead of system's ldd (which does not work when the binary to inspect
> +is compiled for a different architecture).
> +
> +With the fourth option, it is possible to disable building of introspection data
> +(.gir and .typelib files), which may be difficult or impossible in cross-compilation
> +environments, because of lack of emulation (or native hardware) for the target architecture
> +on which the target binaries can be run.
> +
> +These options are useful when cross-compiling for a different target architecture.
> +
> +Upstream-Status: Pending [review on oe-core list]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> + Makefile.am | 2 ++
> + common.mk | 39 +++++++++++++++++++++++++++++++++++++++
> + configure.ac | 42 ++++++++++++++++++++++++++++++++++++++++++
> + tests/Makefile.am | 5 ++++-
> + 4 files changed, 87 insertions(+), 1 deletion(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index b080a89..ce8d29b 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -21,7 +21,9 @@ include Makefile-cmph.am
> + include Makefile-girepository.am
> + include Makefile-giscanner.am
> + include Makefile-examples.am
> ++if BUILD_INTROSPECTION_DATA
> + include Makefile-gir.am
> ++endif
> + include Makefile-tools.am
> + include Makefile-msvcproj.am
> +
> +diff --git a/common.mk b/common.mk
> +index e26c637..9f3a65f 100644
> +--- a/common.mk
> ++++ b/common.mk
> +@@ -6,6 +6,15 @@
> + # module itself.
> + #
> +
> ++if USE_HOST_GI
> ++INTROSPECTION_SCANNER = \
> ++ env PATH="$(PATH)" \
> ++ LPATH=.libs \
> ++ CC="$(CC)" \
> ++ PYTHONPATH=$(top_builddir):$(top_srcdir) \
> ++ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
> ++ g-ir-scanner
> ++else
> + INTROSPECTION_SCANNER = \
> + env PATH=".libs:$(PATH)" \
> + LPATH=.libs \
> +@@ -14,9 +23,24 @@ INTROSPECTION_SCANNER = \
> + UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
> + UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
> + $(top_builddir)/g-ir-scanner
> ++endif
> ++
> ++if USE_CROSS_WRAPPER
> ++CROSS_WRAPPER_ARG = --use-binary-wrapper=$(GI_CROSS_WRAPPER)
> ++else
> ++CROSS_WRAPPER_ARG =
> ++endif
> ++
> ++if USE_LDD_WRAPPER
> ++LDD_WRAPPER_ARG = --use-ldd-wrapper=$(GI_LDD_WRAPPER)
> ++else
> ++LDD_WRAPPER_ARG =
> ++endif
> +
> + INTROSPECTION_SCANNER_ARGS = \
> + --verbose \
> ++ $(CROSS_WRAPPER_ARG) \
> ++ $(LDD_WRAPPER_ARG) \
> + -I$(top_srcdir) \
> + --add-include-path=$(srcdir) \
> + --add-include-path=$(top_srcdir)/gir \
> +@@ -24,9 +48,15 @@ INTROSPECTION_SCANNER_ARGS = \
> + --add-include-path=$(top_builddir) \
> + --add-include-path=$(top_builddir)/gir
> +
> ++if USE_CROSS_WRAPPER
> ++INTROSPECTION_COMPILER = \
> ++ env PATH=".libs:$(PATH)" \
> ++ $(GI_CROSS_WRAPPER) $(top_builddir)/.libs/g-ir-compiler$(EXEEXT)
> ++else
> + INTROSPECTION_COMPILER = \
> + env PATH=".libs:$(PATH)" \
> + $(top_builddir)/g-ir-compiler$(EXEEXT)
> ++endif
> +
> + INTROSPECTION_COMPILER_ARGS = \
> + --includedir=$(srcdir) \
> +@@ -35,6 +65,14 @@ INTROSPECTION_COMPILER_ARGS = \
> + --includedir=$(top_builddir) \
> + --includedir=$(top_builddir)/gir
> +
> ++if USE_HOST_GI
> ++INTROSPECTION_DOCTOOL = \
> ++ env PATH="$(PATH)" \
> ++ LPATH=.libs \
> ++ PYTHONPATH=$(top_builddir):$(top_srcdir) \
> ++ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
> ++ g-ir-doc-tool
> ++else
> + INTROSPECTION_DOCTOOL = \
> + env PATH=".libs:$(PATH)" \
> + LPATH=.libs \
> +@@ -42,6 +80,7 @@ INTROSPECTION_DOCTOOL = \
> + UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
> + UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
> + $(top_builddir)/g-ir-doc-tool
> ++endif
> +
> + INTROSPECTION_DOCTOOL_ARGS = \
> + --add-include-path=$(srcdir) \
> +diff --git a/configure.ac b/configure.ac
> +index 6c91fa5..21340a5 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -360,6 +360,48 @@ fi
> +
> + AC_SUBST(EXTRA_LINK_FLAGS)
> +
> ++AC_ARG_ENABLE([host-gi],
> ++[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])],
> ++[case "${enableval}" in
> ++ yes) host_gi=true ;;
> ++ no) host_gi=false ;;
> ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-host-gi]) ;;
> ++esac],[host_gi=false])
> ++AM_CONDITIONAL([USE_HOST_GI], [test x$host_gi = xtrue])
> ++
> ++AC_ARG_ENABLE([gi-cross-wrapper],
> ++[AS_HELP_STRING([--enable-gi-cross-wrapper=path],[Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)])],
> ++[
> ++GI_CROSS_WRAPPER="${enableval}"
> ++use_wrapper=true
> ++],[
> ++GI_CROSS_WRAPPER=""
> ++use_wrapper=false
> ++])
> ++AC_SUBST(GI_CROSS_WRAPPER)
> ++AM_CONDITIONAL([USE_CROSS_WRAPPER], [test x$use_wrapper = xtrue])
> ++
> ++AC_ARG_ENABLE([gi-ldd-wrapper],
> ++[AS_HELP_STRING([--enable-gi-ldd-wrapper=path],[Use a ldd wrapper instead of system's ldd command in giscanner (useful when cross-compiling)])],
> ++[
> ++GI_LDD_WRAPPER="${enableval}"
> ++use_ldd_wrapper=true
> ++],[
> ++GI_LDD_WRAPPER=""
> ++use_ldd_wrapper=false
> ++])
> ++AC_SUBST(GI_LDD_WRAPPER)
> ++AM_CONDITIONAL([USE_LDD_WRAPPER], [test x$use_ldd_wrapper = xtrue])
> ++
> ++AC_ARG_ENABLE([introspection-data],
> ++[AS_HELP_STRING([--enable-introspection-data],[Build introspection data (.gir and .typelib files) in addition to library and tools])],
> ++[case "${enableval}" in
> ++ yes) introspection_data=true ;;
> ++ no) introspection_data=false ;;
> ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-introspection-data]) ;;
> ++esac],[introspection_data=true])
> ++AM_CONDITIONAL([BUILD_INTROSPECTION_DATA], [test x$introspection_data = xtrue])
> ++
> + AC_CONFIG_FILES([
> + Makefile
> + tests/Makefile
> +diff --git a/tests/Makefile.am b/tests/Makefile.am
> +index bdd0fa7..75dd3c9 100644
> +--- a/tests/Makefile.am
> ++++ b/tests/Makefile.am
> +@@ -1,6 +1,9 @@
> + include $(top_srcdir)/common.mk
> +
> +-SUBDIRS = . scanner repository offsets warn
> ++SUBDIRS = . scanner repository warn
> ++if BUILD_INTROSPECTION_DATA
> ++SUBDIRS += offsets
> ++endif
> +
> + EXTRA_DIST=
> + BUILT_SOURCES=
> +--
> +2.7.0
> +
> diff --git a/package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
> new file mode 100644
> index 0000000000..0fd2299f98
> --- /dev/null
> +++ b/package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
> @@ -0,0 +1,52 @@
> +From 704b888d0abfb01067352c40156f49f655691c7c Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Mon, 19 Oct 2015 18:26:40 +0300
> +Subject: [PATCH] giscanner: add --use-binary-wrapper option
> +
> +With this option, giscanner will use a wrapper executable to run
> +binaries it's producing, instead of running them directly. This
> +is useful when binaries are cross-compiled and cannot be run directly,
> +but they can be run using for example QEMU emulation.
> +
> +Upstream-Status: Pending [review on oe-core list]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> + giscanner/scannermain.py | 14 ++++++++++++++
> + 1 file changed, 14 insertions(+)
> +
> +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
> +index 633496f..d684cd0 100755
> +--- a/giscanner/scannermain.py
> ++++ b/giscanner/scannermain.py
> +@@ -124,6 +124,9 @@ def _get_option_parser():
> + parser.add_option("", "--program",
> + action="store", dest="program", default=None,
> + help="program to execute")
> ++ parser.add_option("", "--use-binary-wrapper",
> ++ action="store", dest="wrapper", default=None,
> ++ help="wrapper to use for running programs (useful when cross-compiling)")
> + parser.add_option("", "--program-arg",
> + action="append", dest="program_args", default=[],
> + help="extra arguments to program")
> +@@ -419,6 +422,17 @@ def create_binary(transformer, options, args):
> + gdump_parser.get_error_quark_functions())
> +
> + shlibs = resolve_shlibs(options, binary, options.libraries)
> ++ if options.wrapper:
> ++ # The wrapper needs the binary itself, not the libtool wrapper script,
> ++ # so we check if libtool has sneaked the binary into .libs subdirectory
> ++ # and adjust the path accordingly
> ++ import os.path
> ++ dir_name, binary_name = os.path.split(binary.args[0])
> ++ libtool_binary = os.path.join(dir_name, '.libs', binary_name)
> ++ if os.path.exists(libtool_binary):
> ++ binary.args[0] = libtool_binary
> ++ # Then prepend the wrapper to the command line to execute
> ++ binary.args = [options.wrapper] + binary.args
> + gdump_parser.set_introspection_binary(binary)
> + gdump_parser.parse()
> + return shlibs
> +--
> +2.7.0
> +
> diff --git a/package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch b/package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
> new file mode 100644
> index 0000000000..97880ef51d
> --- /dev/null
> +++ b/package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
> @@ -0,0 +1,48 @@
> +From d4ad57fd4a32c4f0d2f0522a3090ef940746431b Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Fri, 30 Oct 2015 16:28:46 +0200
> +Subject: [PATCH] giscanner: add a --use-ldd-wrapper option
> +
> +This is useful in cross-compile environments where system's ldd
> +command does not work on binaries built for a different architecture
> +
> +Upstream-Status: Pending [review in oe-core]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> + giscanner/scannermain.py | 3 +++
> + giscanner/shlibs.py | 4 +++-
> + 2 files changed, 6 insertions(+), 1 deletion(-)
> +
> +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
> +index d684cd0..1b3b369 100755
> +--- a/giscanner/scannermain.py
> ++++ b/giscanner/scannermain.py
> +@@ -127,6 +127,9 @@ def _get_option_parser():
> + parser.add_option("", "--use-binary-wrapper",
> + action="store", dest="wrapper", default=None,
> + help="wrapper to use for running programs (useful when cross-compiling)")
> ++ parser.add_option("", "--use-ldd-wrapper",
> ++ action="store", dest="ldd_wrapper", default=None,
> ++ help="wrapper to use instead of ldd (useful when cross-compiling)")
> + parser.add_option("", "--program-arg",
> + action="append", dest="program_args", default=[],
> + help="extra arguments to program")
> +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
> +index c93d20c..c5b5942 100644
> +--- a/giscanner/shlibs.py
> ++++ b/giscanner/shlibs.py
> +@@ -105,7 +105,9 @@ def _resolve_non_libtool(options, binary, libraries):
> + args.extend(libtool)
> + args.append('--mode=execute')
> + platform_system = platform.system()
> +- if platform_system == 'Darwin':
> ++ if options.ldd_wrapper:
> ++ args.extend([options.ldd_wrapper, binary.args[0]])
> ++ elif platform_system == 'Darwin':
> + args.extend(['otool', '-L', binary.args[0]])
> + else:
> + args.extend(['ldd', binary.args[0]])
> +--
> +2.7.0
> +
> diff --git a/package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch b/package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch
> new file mode 100644
> index 0000000000..5539b467a9
> --- /dev/null
> +++ b/package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch
> @@ -0,0 +1,39 @@
> +From 08ee7e704d3ebbb783e26768074a5969d6843204 Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <Adamduskett@outlook.com>
> +Date: Wed, 18 Oct 2017 17:31:19 -0400
> +Subject: [PATCH] add PYTHON_INCLUDES override
> +
> +As the configure script mixes up host/target python. Equivalent to the
> +similar code in dbus-python.
> +
> +Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
> +---
> + m4/python.m4 | 12 +++++++++++-
> + 1 file changed, 11 insertions(+), 1 deletion(-)
> +
> +diff --git a/m4/python.m4 b/m4/python.m4
> +index ed5559d..9853263 100644
> +--- a/m4/python.m4
> ++++ b/m4/python.m4
> +@@ -43,7 +43,17 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
> + [AC_REQUIRE([AM_PATH_PYTHON])
> + AC_MSG_CHECKING(for headers required to compile python extensions)
> + dnl deduce PYTHON_INCLUDES
> +-PYTHON_INCLUDES=`$PYTHON-config --includes`
> ++if test "${PYTHON_INCLUDES+set}" = set; then
> ++ AC_MSG_NOTICE([PYTHON_INCLUDES overridden to: $PYTHON_INCLUDES])
> ++else
> ++ if test -x "$PYTHON_CONFIG"; then
> ++ PYTHON_INCLUDES=`$PYTHON_CONFIG --includes 2>/dev/null`
> ++ else
> ++ PYTHON_INCLUDES=`$PYTHON -c "import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_inc(True))"`
> ++ PYTHON_INCLUDES="-I$PYTHON_INCLUDES"
> ++ fi
> ++fi
> ++
> + AC_SUBST(PYTHON_INCLUDES)
> + dnl check if the headers exist:
> + save_CPPFLAGS="$CPPFLAGS"
> +--
> +2.13.6
> +
> diff --git a/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
> new file mode 100644
> index 0000000000..4ec527dcc0
> --- /dev/null
> +++ b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
> @@ -0,0 +1,73 @@
> +From e48f1e18f5ea41656f0ba10fe61d69d2604b0064 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Wed, 3 Jan 2018 17:02:01 +0200
> +Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
> +
> +By default LD_LIBRARY_PATH is set to the list of target library paths;
> +this breaks down in cross-compilation environment, as we need to run a
> +native emulation wrapper rather than the target binary itself. This patch
> +allows exporting those paths to a different environment variable
> +which can be picked up and used by the wrapper.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
> +---
> + giscanner/ccompiler.py | 4 ++--
> + giscanner/dumper.py | 3 ++-
> + giscanner/scannermain.py | 3 +++
> + 3 files changed, 7 insertions(+), 3 deletions(-)
> +
> +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
> +index 29de0ee..928eae8 100644
> +--- a/giscanner/ccompiler.py
> ++++ b/giscanner/ccompiler.py
> +@@ -109,7 +109,7 @@ class CCompiler(object):
> +
> + self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations"
> +
> +- def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths):
> ++ def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths, lib_dirs_envvar):
> + # An "internal" link is where the library to be introspected
> + # is being built in the current directory.
> +
> +@@ -119,7 +119,7 @@ class CCompiler(object):
> + if self.check_is_msvc():
> + runtime_path_envvar = ['LIB', 'PATH']
> + else:
> +- runtime_path_envvar = ['LD_LIBRARY_PATH']
> ++ runtime_path_envvar = ['LD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
> + # Search the current directory first
> + # (This flag is not supported nor needed for Visual C++)
> + args.append('-L.')
> +diff --git a/giscanner/dumper.py b/giscanner/dumper.py
> +index 7f77bd2..db96df6 100644
> +--- a/giscanner/dumper.py
> ++++ b/giscanner/dumper.py
> +@@ -259,7 +259,8 @@ class DumpCompiler(object):
> + libtool,
> + self._options.libraries,
> + self._options.extra_libraries,
> +- self._options.library_paths)
> ++ self._options.library_paths,
> ++ self._options.lib_dirs_envvar)
> + args.extend(pkg_config_libs)
> +
> + else:
> +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
> +index 38a45c1..b603850 100755
> +--- a/giscanner/scannermain.py
> ++++ b/giscanner/scannermain.py
> +@@ -130,6 +130,9 @@ def _get_option_parser():
> + parser.add_option("", "--use-ldd-wrapper",
> + action="store", dest="ldd_wrapper", default=None,
> + help="wrapper to use instead of ldd (useful when cross-compiling)")
> ++ parser.add_option("", "--lib-dirs-envvar",
> ++ action="store", dest="lib_dirs_envvar", default=None,
> ++ help="environment variable to write a list of library directories to (for running the transient binary), instead of standard LD_LIBRARY_PATH")
> + parser.add_option("", "--program-arg",
> + action="append", dest="program_args", default=[],
> + help="extra arguments to program")
> +--
> +2.15.1
> +
> diff --git a/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
> new file mode 100644
> index 0000000000..02fcdbeb25
> --- /dev/null
> +++ b/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
> @@ -0,0 +1,29 @@
> +From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <aduskett@gmail.com>
> +Date: Wed, 14 Mar 2018 12:07:10 -0400
> +Subject: [PATCH] Add rpath links to ccompiler
> +
> +This patch allows gobject-introspection to process extra paths passed to the
> +compiler via the GIR_EXTRA_LIBS_PATH variable.
> +
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> + giscanner/ccompiler.py | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
> +index a8bd5b1..51bb9bc 100644
> +--- a/giscanner/ccompiler.py
> ++++ b/giscanner/ccompiler.py
> +@@ -163,6 +163,8 @@ class CCompiler(object):
> +
> + for envvar in runtime_path_envvar:
> + if envvar in os.environ:
> ++ for envvar_path in os.environ[envvar].split(':'):
> ++ args.append("-Wl,-rpath-link," + envvar_path)
> + os.environ[envvar] = \
> + os.pathsep.join(runtime_paths + [os.environ[envvar]])
> + else:
> +--
> +2.14.3
> +
> diff --git a/package/gobject-introspection/0008-add-Float128.patch b/package/gobject-introspection/0008-add-Float128.patch
> new file mode 100644
> index 0000000000..661affda34
> --- /dev/null
> +++ b/package/gobject-introspection/0008-add-Float128.patch
> @@ -0,0 +1,28 @@
> +scanner: Add _Float128
> +
> +The ISO/IEC TS 18661-3:2015 standard added new floating point types to
> +the C standard.
> +
> +Newer versions of the GNU C library started exposing `_Float128` in the
> +headers, which means we need to add this type to the known tokens, to
> +avoid warnings.
> +
> +original commit:
> +https://github.com/GNOME/gobject-introspection/commit/8cf3e8e5cf6d0d49db359f50c6eb0bc9ca22fbef
> +
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> +
> +diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
> +index 7dbab5c8..218024e9 100644
> +--- a/giscanner/scannerlexer.l
> ++++ b/giscanner/scannerlexer.l
> +@@ -192,7 +192,7 @@ stringtext ([^\\\"])|(\\.)
> + "__stdcall" { /* ignore */ }
> + "__w64" { /* ignore */ }
> + "__int64" { return INT; }
> +-
> ++"_Float128" { return FLOAT; }
> +
> + "G_GINT64_CONSTANT" { return INTL_CONST; }
> + "G_GUINT64_CONSTANT" { return INTUL_CONST; }
> diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in
> new file mode 100644
> index 0000000000..fccdc0a936
> --- /dev/null
> +++ b/package/gobject-introspection/Config.in
> @@ -0,0 +1,30 @@
> +config BR2_PACKAGE_GOBJECT_INTROSPECTION
> + bool "gobject-introspection"
> + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
> + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi, libglib2
> + depends on BR2_TOOLCHAIN_USES_GLIBC
> + depends on BR2_USE_MMU # python3, libglib2
> + depends on BR2_USE_WCHAR # python3, libglib2 -> gettext
> + depends on !BR2_STATIC_LIBS
> + depends on !BR2_MIPS_NABI32
> + select BR2_PACKAGE_LIBFFI
> + select BR2_PACKAGE_ZLIB
> + select BR2_PACKAGE_LIBGLIB2
> + select BR2_PACKAGE_HOST_QEMU
> + select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
> + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
> + help
> + GObject introspection is a middleware layer between C
> + libraries (using GObject) and language bindings. The C library
> + can be scanned at compile time and generate a metadata file,
> + in addition to the actual native C library. Then at runtime,
> + language bindings can read this metadata and automatically
> + provide bindings to call into the C library.
> +
> + https://wiki.gnome.org/action/show/Projects/GObjectIntrospection
> +
> +comment "gobject-introspection needs a glibc toolchain w/ wchar, threads, dynamic library"
> + depends on BR2_USE_MMU
> + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET
> + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
> + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_USES_GLIBC
> diff --git a/package/gobject-introspection/cross-ldd b/package/gobject-introspection/cross-ldd
> new file mode 100644
> index 0000000000..ef2ca20f39
> --- /dev/null
> +++ b/package/gobject-introspection/cross-ldd
> @@ -0,0 +1,362 @@
> +#!/bin/bash
> +
> +# ldd drop-in replacement for cross-compilation toolchains.
> +
> +# This file is a slightly modified version of xldd.in from
> +# crosstool-ng 1.22.0
> +
> +# In order to use it, copy it in same directory than other
> +# toolchain binaries and rename it with same tuple.
> +# (i.e. /opt/arm-sysmic-linux-gnueabihf/bin/arm-sysmic-linux-gnueabihf-ldd)
> +# Thus, this will automaticaly detect necessary information
> +# about your toolchain.
> +
> +export LC_ALL=C
> +version="forked from crosstool-ng 1.22.0"
> +# Change it to 64 if necessary
> +bits="32"
> +sed="${SED:-sed}"
> +grep="${GREP:-grep}"
> +
> +my_name="$( basename "${0}" )"
> +prefix="${0%-ldd}"
> +gcc="${prefix}-gcc"
> +readelf="${prefix}-readelf"
> +fake_load_addr_root="$((0xdeadbeef))"
> +fake_load_addr_rpath="$((0xdeadc0de))"
> +fake_load_addr_sysroot="$((0x8badf00d))"
> +ld_library_path="/lib:/usr/lib"
> +
> +do_error() {
> + printf "%s: %s\n" "${my_name}" "$*" >&2
> +}
> +
> +do_opt_error() {
> + do_error "$@"
> + printf "Try \`%s --help' for more information\n" "${my_name}" >&2
> +}
> +
> +do_trace() {
> + local depth=0
> +
> + [ -z "${CT_XLDD_VERBOSE}" ] && return 0
> +
> + for((depth=0; "${#FUNCNAME[$((depth+1))]}" != 0; depth++)); do :; done
> + printf "%*s" $((4*(depth-1))) "" >&2
> + printf -- "$@" >&2
> +}
> +
> +show_version() {
> + # Fake a real ldd, just in case some dumb script would check
> + cat <<_EOF_
> +ldd (crosstool-NG) ${version}
> +Copyright (C) 2010 "Yann E. MORIN" <yann.morin.1998@free.fr>
> +This is free software; see the source for copying conditions. There is NO
> +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> +Licensed under the GPLv2, see the file LICENSES in the top-directory of the
> +sources for this package.
> +_EOF_
> +}
> +
> +show_help() {
> + cat <<_EOF_
> +Usage: ${my_name} [OPTION]... --root DIR FILE...
> + --help print this help and exit
> + --version print version information and exit
> + --root dir treat dir as being the root of the target
> + -s, --show-system mark libs from the sysroot with a trailing '[*]'
> + and libs found via RPATH with a trailing '[+]'
> +
> +_EOF_
> + cat <<_EOF_ |fmt
> +${my_name} tries to mimick the behavior of a real native ldd, but can be
> +used in a cross-development environment. Here is how it differs from a
> +real native ldd:
> +
> +If the CT_XLDD_VERBOSE variable is set and non-empty, then ${my_name} will
> +print a lot of debug messages, explaining how it builds the library
> +search path, and how each library was found and why.
> +
> +The LD_LIBRARY_PATH variable is not used, as it can not reliably be
> +guessed except at runtime, and we can't run.
> +
> +${my_name} does not scan /etc/ld.so.cache, but instead uses /etc/ld.so.conf
> +(it understands the include directives therein for libces that have that).
> +
> +${my_name} also interprets (tries to!) the RPATH/RUNPATH records found in
> +the dynamic ELF section. Such paths are searched for only relative to
> +the specified root, not from the sysroot (see below). Also, those paths
> +are searched for not only for the file they appear in, but also for its
> +dependencies.
> +
> +${my_name} will search the directory specified with --root for libraries
> +to resolve the NEEDED tags. If --root is not set, then ${my_name} will
> +use the value in the environment variable \${CT_XLDD_ROOT}. If neither
> +is set, then this is an error.
> +
> +If NEEDED libraries can't be found in the specified root directory, then
> +${my_name} will also look in the sysroot of the toolchain to see if it
> +can find them.
> +
> +For NEEDED libraries that were found, the output will look like:
> + libneeded.so => /path/to/libneeded.so (0xloadaddr)
> +
> +and for those that were not found, the output will look like:
> + libneeded.so not found
> +
> +The paths are relative to the specified root directory, or to the sysroot
> +(eg. /lib/libneeded.so, /usr/lib/libneeded.so, and so on...).
> +
> +The expected load address 'loadaddr' is a faked address to match the output
> +of the real ldd, but has no actual meaning (set to some constants for now,
> +0x8badf00d for libraries from the sysroot, 0xdeadc0de for those found via
> +the RPATH/RUNPATH records, and 0xdeadbeef for others).
> +_EOF_
> +
> +# Unimplemeted yet:
> +# -d, --data-relocs process data relocations
> +# -r, --function-relocs process data and function relocations
> +# -u, --unused print unused direct dependencies
> +# -v, --verbose print all information
> +
> +# See also this thread:
> +# http://sourceware.org/ml/crossgcc/2008-09/msg00057.html
> +}
> +
> +# Parse command line options
> +root="${CT_XLDD_ROOT}"
> +show_system=
> +while true; do
> + case "${1}" in
> + --help)
> + show_help
> + exit 0
> + ;;
> + --version)
> + show_version
> + exit 0
> + ;;
> + --root)
> + root="$2"
> + shift
> + ;;
> + --root=*)
> + root="${1#--root=}"
> + ;;
> + --show-system|-s)
> + show_system=1
> + ;;
> + -*)
> + do_opt_error "unrecognized option \`${1}'"
> + exit 1
> + ;;
> + *)
> + break
> + ;;
> + esac
> + shift
> +done
> +
> +# Sanity checks
> +sysroot="$( "${gcc}" -print-sysroot 2>/dev/null )"
> +if [ -z "${sysroot}" ]; then
> + sysroot="$( "${gcc}" -print-file-name=libc.so 2>/dev/null \
> + |${sed} -r -e 's:/usr/lib/libc.so$::;' \
> + )"
> +fi
> +if [ -z "${sysroot}" ]; then
> + do_error "unable to find sysroot for \`${gcc}'"
> +fi
> +
> +if [ -z "${root}" ]; then
> + root=${sysroot}
> +fi
> +if [ ! -d "${root}" ]; then
> + do_error "\`${root}': no such file or directory"
> + exit 1
> +fi
> +
> +do_report_needed_found() {
> + local needed="${1}"
> + local path="${2}"
> + local origin="${3}"
> + local loadaddr
> + local sys
> +
> + case "${origin}" in
> + root)
> + loadaddr="${fake_load_addr_root}"
> + ;;
> + rpath)
> + loadaddr="${fake_load_addr_rpath}"
> + if [ -n "${show_system}" ]; then
> + sys=" [+]"
> + fi
> + ;;
> + sysroot)
> + loadaddr="${fake_load_addr_sysroot}"
> + if [ -n "${show_system}" ]; then
> + sys=" [*]"
> + fi
> + ;;
> + esac
> +
> + printf "%8s%s => %s (0x%0*x)%s\n" \
> + "" \
> + "${needed}" \
> + "${path}" \
> + "$((bits/4))" \
> + "${loadaddr}" \
> + "${sys}"
> +}
> +
> +# Search a needed file, scanning ${lib_dir} in the root directory
> +do_find_needed() {
> + local needed="${1}"
> + local -a list
> + local -a dirs
> + local found
> + local where
> + local base
> + local d i
> +
> + do_trace "Searching for '%s'\n" "${needed}"
> +
> + # rpath shall come first!
> + list=( \
> + "rpath:${root}" \
> + "root:${root}" \
> + "sysroot:${sysroot}" \
> + )
> +
> + for i in "${list[@]}"; do
> + where="${i%%:*}"
> + base="${i#*:}"
> + if [ "${where}" = "rpath" ]; then
> + dirs=( "${search_rpath[@]}" )
> + else
> + dirs=( "${needed_search_path[@]}" )
> + fi
> + for d in "${dirs[@]}"; do
> + do_trace "-> looking in '%s' (%s)\n" "${d}" "${where}"
> + if [ -f "${base}${d}/${needed}" ]; then
> + found="${d}/${needed}"
> + do_trace "---> found\n"
> + break 2
> + fi
> + done
> + done
> +
> + if [ -n "${found}" ]; then
> + do_report_needed_found "${needed}" "${found}" "${where}"
> + do_process_file "${base}${found}"
> + else
> + printf "%8s%s not found\n" "" "${needed}"
> + fi
> +
> + do_trace "Done searching for '%s'\n" "${needed}"
> +}
> +
> +# Scan a file for all NEEDED tags
> +do_process_file() {
> + local file="${1}"
> + local -a save_search_rpath
> + local n m
> + local found
> +
> + do_trace "Parsing file '%s'\n" "${file}"
> +
> + save_search_rpath=( "${search_rpath[@]}" )
> + for n in $( "${readelf}" -d "${file}" \
> + |"${grep}" -E '\((RPATH|RUNPATH)\)' \
> + |"${sed}" -r -e 's/^.*Library r(|un)path:[[:space:]]+\[(.*)\]$/\2/;'\
> + ); do
> + do_trace "-> adding rpath '%s'\n" "${n}"
> + search_rpath+=( "${n}" )
> + done
> + do_trace ": search path:\n"
> + for n in "${search_rpath[@]}" "${needed_search_path[@]}"; do
> + do_trace ": - '%s'\n" "${n}"
> + done
> + do_trace ": end search path\n"
> +
> + for n in $( "${readelf}" -d "${file}" \
> + |"${grep}" -E '\(NEEDED\)' \
> + |"${sed}" -r -e 's/^.*Shared library:[[:space:]]+\[([^]]+)\].*/\1/;' \
> + ); do
> + found=0
> + for m in "${needed_list[@]}"; do
> + [ "${n}" = "${m}" ] && found=1 && break
> + done
> + if [ ${found} -ne 0 ]; then
> + do_trace "-> skipping already known dependency '%s'\n" "${n}"
> + continue
> + fi
> + do_trace "-> handling new dependency '%s'\n" "${n}"
> + needed_list+=( "${n}" )
> + do_find_needed "${n}"
> + do_trace "-> done handling dependency '%s'\n" "${n}"
> + done
> +
> + search_rpath=( "${save_search_rpath[@]}" )
> +
> + do_trace "Finished parsing file '%s'\n" "${file}"
> +}
> +
> +# Recursively scan a /etc/ld.so.conf file
> +do_scan_etc_ldsoconf() {
> + local ldsoconf="${1}"
> + local g
> + local f
> +
> + [ -f "${ldsoconf}" ] || return 0
> + do_trace "Parsing ld.so.conf: '%s'\n" "${ldsoconf}"
> +
> + while read line; do
> + case "${line}" in
> + include\ *)
> + g="${root}${line#include }"
> + do_trace "-> handling include directive '%s'\n" "${g}"
> + for f in ${g}; do
> + do_scan_etc_ldsoconf "${f}"
> + done
> + do_trace "-> finished handling include directive '%s'\n" "${g}"
> + ;;
> + \#*|"")
> + ;;
> + *)
> + do_trace "-> adding search dir '%s'\n" "${line}"
> + needed_search_path+=( "${line}" )
> + ;;
> + esac
> + done <"${ldsoconf}"
> +
> + do_trace "Finished parsing ld.so.conf: '%s'\n" "${ldsoconf}"
> +}
> +
> +# Build up the full list of search directories
> +declare -a needed_search_path
> +do_trace "Adding basic lib dirs\n"
> +ld_library_path="${ld_library_path}:"
> +while [ -n "${ld_library_path}" ]; do
> + d="${ld_library_path%%:*}"
> + if [ -n "${d}" ]; then
> + do_trace "-> adding search dir '%s'\n" "${d}"
> + needed_search_path+=( "${d}" )
> + fi
> + ld_library_path="${ld_library_path#*:}"
> +done
> +do_trace "Done adding basic lib dirs\n"
> +do_trace "Scanning '/etc/ld.so.conf'\n"
> +do_scan_etc_ldsoconf "${root}/etc/ld.so.conf"
> +do_trace "Done scanning '/etc/ld.so.conf'\n"
> +do_trace "Search path:\n"
> +for p in "${needed_search_path[@]}"; do
> + do_trace "-> '%s'\n" "${p}"
> +done
> +
> +declare -a needed_list
> +declare -a search_rpath
> +do_trace "Scanning file '%s'\n" "${1}"
> +do_process_file "${1}"
> +do_trace "Done scanning file '%s'\n" "${1}"
> diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in
> new file mode 100644
> index 0000000000..b2f97ea870
> --- /dev/null
> +++ b/package/gobject-introspection/g-ir-compiler.in
> @@ -0,0 +1,2 @@
> +#!/bin/sh
> +$STAGING_DIR/usr/bin/g-ir-scanner-qemuwrapper $STAGING_DIR/usr/bin/g-ir-compiler.real "$@"
> diff --git a/package/gobject-introspection/g-ir-scanner-lddwrapper.in b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
> new file mode 100644
> index 0000000000..3313c877f8
> --- /dev/null
> +++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
> @@ -0,0 +1,2 @@
> +#!/bin/sh
> +${TARGET_CROSS}ldd "$@"
> diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
> new file mode 100644
> index 0000000000..aae36a1fa9
> --- /dev/null
> +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
> @@ -0,0 +1,10 @@
> +#!/bin/sh
> +# Use a modules directory which does not exist so we don't load random things
> +# which may then get deleted (or their dependencies) and potentially segfault
> +export GIO_MODULE_DIR=$STAGING_DIR/usr/lib/gio/modules-dummy
> +PSEUDO_UNLOAD=1 $HOST_DIR/bin/qemu- at HOST_QEMU_ARCH@ @HOST_QEMU_CPU_TUNE@ -r @TOOLCHAIN_HEADERS_VERSION@ -L $STAGING_DIR -E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:$STAGING_DIR/usr/lib:$STAGING_DIR/lib "$@"
> +if [[ $? -ne 0 ]]; then
> + echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help."
> + echo '(typically like this: GIR_EXTRA_LIBS_PATH="$(@D)/.libs")'
> + exit 1
> +fi
> diff --git a/package/gobject-introspection/g-ir-scanner.in b/package/gobject-introspection/g-ir-scanner.in
> new file mode 100644
> index 0000000000..71b1871cfd
> --- /dev/null
> +++ b/package/gobject-introspection/g-ir-scanner.in
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +export GI_SCANNER_DISABLE_CACHE=1
> +$HOST_DIR/bin/g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=$STAGING_DIR/usr/bin/g-ir-scanner-qemuwrapper --use-ldd-wrapper=$STAGING_DIR/usr/bin/g-ir-scanner-lddwrapper --add-include-path=$STAGING_DIR/usr/share/gir-1.0 "$@"
> diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash
> new file mode 100644
> index 0000000000..a41fb58a5f
> --- /dev/null
> +++ b/package/gobject-introspection/gobject-introspection.hash
> @@ -0,0 +1,4 @@
> +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.54/gobject-introspection-1.54.1.sha256sum
> +sha256 b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e gobject-introspection-1.54.1.tar.xz
> +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL
> +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL
> diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
> new file mode 100644
> index 0000000000..fe55da0b99
> --- /dev/null
> +++ b/package/gobject-introspection/gobject-introspection.mk
> @@ -0,0 +1,90 @@
> +################################################################################
> +#
> +# gobject-introspection
> +#
> +################################################################################
> +
> +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.54
> +GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).1
> +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_DEPENDENCIES = libffi zlib libglib2 host-qemu host-gobject-introspection
> +GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
> +GOBJECT_INTROSPECTION_AUTORECONF = YES
> +GOBJECT_INTROSPECTION_LICENSE = Dual LGPLv2+/GPLv2+
> +GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL
> +HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = host-libglib2 host-flex host-bison
> +
> +GOBJECT_INTROSPECTION_CONF_OPTS = \
> + --enable-host-gi \
> + --disable-static \
> + --enable-gi-cross-wrapper=$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper \
> + --enable-gi-ldd-wrapper=$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper \
> + --disable-introspection-data
> +
> +ifeq ($(BR2_PACKAGE_CAIRO),y)
> +GOBJECT_INTROSPECTION_DEPENDENCIES += cairo
> +endif
> +ifeq ($(BR2_PACKAGE_LIBFFI),y)
> +GOBJECT_INTROSPECTION_DEPENDENCIES += libffi
> +endif
> +
> +ifeq ($(BR2_PACKAGE_PYTHON),y)
> +GOBJECT_INTROSPECTION_DEPENDENCIES += python
> +HOST_GOBJECT_INTROSPECTION_DEPENDENCIES += host-python
> +GOBJECT_INTROSPECTION_PYTHON_PATH="$(STAGING_DIR)/usr/bin/python2"
> +else
> +GOBJECT_INTROSPECTION_DEPENDENCIES += python3
> +HOST_GOBJECT_INTROSPECTION_DEPENDENCIES += host-python3
> +GOBJECT_INTROSPECTION_PYTHON_PATH="$(STAGING_DIR)/usr/bin/python3"
> +endif
> +
> +# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to $HOME
> +GOBJECT_INTROSPECTION_CONF_ENV = \
> + GI_SCANNER_DISABLE_CACHE=1 \
> + GIR_EXTRA_LIBS_PATH=$(@D)/.libs \
> + PYTHON_INCLUDES="`$(GOBJECT_INTROSPECTION_PYTHON_PATH)-config --includes`"
> +
> +# Make sure g-ir-tool-template uses the host python.
> +define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
> + sed -i -e '1s,#!.*,#!$(HOST_DIR)/bin/python,' $(@D)/tools/g-ir-tool-template.in
> +endef
> +GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS = GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
> +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS = GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
> +
> +GOBJECT_INTROSPECTION_WRAPPERS = \
> + g-ir-compiler \
> + g-ir-scanner
> +
> +# In order for gobject-introspection to work, qemu needs to run temporarily
> +# to create binaries on the fly by g-ir-scanner. This involves creating
> +# several wrapper scripts to accomplish the task:
> +# g-ir-scanner-qemuwrapper, g-ir-compiler-wrapper,
> +# g-ir-scanner-lddwrapper, g-ir-scanner-wrapper, g-ir-compiler-wrapper, and
> +# finally a cross-ldd.
> +define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
> + # Move the real binaries to their names.real, then replace them with
> + # the wrappers.
> + $(foreach w,$(GOBJECT_INTROSPECTION_WRAPPERS),
> + mv $(STAGING_DIR)/usr/bin/$(w) $(STAGING_DIR)/usr/bin/$(w).real
> + $(INSTALL) -D -m 755 \
> + package/gobject-introspection/$(w).in $(STAGING_DIR)/usr/bin/$(w)
> + )
> + $(INSTALL) -D -m 755 package/gobject-introspection/cross-ldd $(TARGET_CROSS)ldd
> + $(INSTALL) -D -m 755 package/gobject-introspection/g-ir-scanner-lddwrapper.in $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper
> + $(INSTALL) -D -m 755 package/gobject-introspection/g-ir-scanner-qemuwrapper.in $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
> + $(SED) "s|@HOST_QEMU_ARCH@|$(HOST_QEMU_ARCH)|g" $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
> + $(SED) "s|@HOST_QEMU_CPU_TUNE@|$(HOST_QEMU_CPU_TUNE)|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
> + $(SED) "s at g_ir_scanner=.*@g_ir_scanner=$(STAGING_DIR)/usr/bin/g-ir-scanner at g" \
> + $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
> +
> + # The pkgconfig file needs to point towards the wrappers instead of the native
> + # binaries.
> + $(SED) "s at g_ir_compiler=.*@g_ir_compiler=$(STAGING_DIR)/usr/bin/g-ir-compiler at g" \
> + $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
> +endef
> +GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS = GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
> +
> +$(eval $(autotools-package))
> +$(eval $(host-autotools-package))
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> index 45de99356f..06021f95c1 100644
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -162,6 +162,7 @@ endif
>
> $(2)_CONF_ENV ?=
> $(2)_CONF_OPTS ?=
> +$(2)_GIR_EXTRA_LIBS_PATH ?=
> $(2)_MAKE_ENV ?=
> $(2)_MAKE_OPTS ?=
> $(2)_INSTALL_OPTS ?= install
> @@ -239,6 +240,8 @@ endef
> endif
> endif
>
> +export GIR_EXTRA_LIBS_PATH=$$($$(PKG)_GIR_EXTRA_LIBS_PATH)
> +
> $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
>
> ifeq ($$($(2)_AUTORECONF),YES)
> --
> 2.14.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-03-14 18:49 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-14 17:24 [Buildroot] [PATCH v4 0/4] gobject-introspection: new series Adam Duskett
2018-03-14 17:24 ` [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection Adam Duskett
2018-03-14 18:02 ` Yann E. MORIN
2018-03-14 17:24 ` [Buildroot] [PATCH v4 2/4] gstreamer1 packages: explicitly disable introspection Adam Duskett
2018-03-14 18:05 ` Yann E. MORIN
2018-03-14 17:24 ` [Buildroot] [PATCH v4 3/4] gobject-introspection: new package Adam Duskett
2018-03-14 18:49 ` Yann E. MORIN
2018-03-14 17:24 ` [Buildroot] [PATCH v4 4/4] gstreamer1 packages: add support for introspection Adam Duskett
-- strict thread matches above, loose matches on Subject: below --
2018-03-14 17:12 [Buildroot] [PATCH v4 1/4] qemu: cleanup for gobject-introspection Adam Duskett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox