All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v16 0/4] package/gobject-introspection: new package
@ 2020-02-07  2:38 aduskett at gmail.com
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 1/4] package/libiberty: " aduskett at gmail.com
                   ` (4 more replies)
  0 siblings, 5 replies; 11+ messages in thread
From: aduskett at gmail.com @ 2020-02-07  2:38 UTC (permalink / raw)
  To: buildroot

From: Adam Duskett <Aduskett@gmail.com>

This time, with 100% more working.

My brain didn't work so well at Devdays apparently:

Changes:
  - Add gobject-introspection back into Config.in. I'm bad and somehow missed
    this in v15.
  
  - Remove GOBJECT_INTROSPECTION_PC_FILE_FIXUP in goi.mk, as the sed wasn't
    doing anything.
  
  - Paths in g-ir-compiler.in weren't 100% correct due to moving g-ir-compiler
    to the host directory, so qemu was trying to load the host compiler and not
    the staging compiler, which would cause qemu to puke.

  - I removed a -x in g-ir-scanner-wrapper because I am blind.
  
I tested this patch series with gstreamer1, and it works! You, too, can now
have high-functioning projects use glib based c libraries! Hooray!

Thanks, everybody!

Adam
Adam

Adam Duskett (4):
  package/libiberty: new package
  package/prelink-cross: new package
  package/gdb: depend on libiberty
  package/gobject-introspection: new package

 DEVELOPERS                                    |   3 +
 package/Config.in                             |   1 +
 package/gdb/gdb.mk                            |   4 +-
 ...lete-upstream-attempt-at-cross-compi.patch |  33 ++++
 ...d-cross-compilation-support-to-meson.patch | 163 ++++++++++++++++++
 .../0003-disable-tests.patch                  |  29 ++++
 ...canner-add-use-binary-wrapper-option.patch |  52 ++++++
 ...scanner-add-a-use-ldd-wrapper-option.patch |  48 ++++++
 ...scanner-add-a-lib-dirs-envvar-option.patch |  73 ++++++++
 .../0007-Add-rpath-links-to-ccompiler.patch   |  29 ++++
 ...-error-return-codes-from-ldd-wrapper.patch |  28 +++
 package/gobject-introspection/Config.in       |  33 ++++
 .../gobject-introspection/g-ir-compiler.in    |   3 +
 .../g-ir-scanner-lddwrapper.in                |   2 +
 .../g-ir-scanner-qemuwrapper.in               |  17 ++
 package/gobject-introspection/g-ir-scanner.in |   8 +
 .../gobject-introspection.hash                |   4 +
 .../gobject-introspection.mk                  | 116 +++++++++++++
 package/libiberty/libiberty.hash              |   2 +
 package/libiberty/libiberty.mk                |  27 +++
 package/prelink-cross/prelink-cross.hash      |   3 +
 package/prelink-cross/prelink-cross.mk        |  16 ++
 22 files changed, 693 insertions(+), 1 deletion(-)
 create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
 create mode 100644 package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
 create mode 100644 package/gobject-introspection/0003-disable-tests.patch
 create mode 100644 package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
 create mode 100644 package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.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-ignore-error-return-codes-from-ldd-wrapper.patch
 create mode 100644 package/gobject-introspection/Config.in
 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/libiberty/libiberty.hash
 create mode 100644 package/libiberty/libiberty.mk
 create mode 100644 package/prelink-cross/prelink-cross.hash
 create mode 100644 package/prelink-cross/prelink-cross.mk

-- 
2.24.1

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 1/4] package/libiberty: new package
  2020-02-07  2:38 [Buildroot] [PATCH v16 0/4] package/gobject-introspection: new package aduskett at gmail.com
@ 2020-02-07  2:38 ` aduskett at gmail.com
  2020-02-07 21:44   ` Giulio Benetti
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 2/4] package/gdb: depend on libiberty aduskett at gmail.com
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 11+ messages in thread
From: aduskett at gmail.com @ 2020-02-07  2:38 UTC (permalink / raw)
  To: buildroot

From: Adam Duskett <Aduskett@gmail.com>

Some packages, like prelink-cross, want to use libiberty but do not bundle
their own instance (which is good!).

However, libiberty is made for being bundled in packages: all GNU
packages that use libiberty (gcc, Binutils, gdb, et al...) all have their own
bundled variant. This common practice means that there is no official upstream
for libiberty, the closest being as part of the combined Binutils-gdb tree.

So we introduce a new host-only package, that installs just libiberty from a
Binutils released tarball.

Again, as packages usually bundle libiberty, it usually only installs a static
version. Furthermore, it does not obey the usual --enable-shared and
--disable-static flags; it only ever builds a static version.

Furthermore, -fPIC is not used with this library, but some packages may pick it
to build shared objects. This behavior is the case for host-gdb, for example,
which accidentally picks that library instead of its internal one.

So, rather than fix the various gdb versions and variants we can use, we ensure
that the libiberty we install is usable in shared objects, and we always build
before host-gdb.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
Changes v15 -> v16:
  - Cleaned up the grammar in the commit message.

Changes v1 -> v15:
  - Add this patch to the series

 DEVELOPERS                       |  1 +
 package/libiberty/libiberty.hash |  2 ++
 package/libiberty/libiberty.mk   | 27 +++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/libiberty/libiberty.hash
 create mode 100644 package/libiberty/libiberty.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index d8ea23e0b3..79ddddd9c3 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2552,6 +2552,7 @@ F:	package/keyutils/
 F:	package/libbsd/
 F:	package/libedit/
 F:	package/libgsm/
+F:	package/libiberty/
 F:	package/libinput/
 F:	package/libiscsi/
 F:	package/libpri/
diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash
new file mode 100644
index 0000000000..270f38dfa7
--- /dev/null
+++ b/package/libiberty/libiberty.hash
@@ -0,0 +1,2 @@
+# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum
+sha512  d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a  binutils-2.32.tar.xz
diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk
new file mode 100644
index 0000000000..17976fdd4f
--- /dev/null
+++ b/package/libiberty/libiberty.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# libiberty
+#
+################################################################################
+
+LIBIBERTY_VERSION = 2.32
+LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz
+LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils
+LIBIBERTY_DL_SUBDIR = binutils
+LIBIBERTY_SUBDIR = libiberty
+
+# We explicitly disable multilib, as we do in binutils.
+# By default, libiberty installs nothing, so we must force it.
+HOST_LIBIBERTY_CONF_OPTS = \
+	--disable-multilib \
+	--enable-install-libiberty
+
+# Some packages (e.g. host-gdb) will pick this library and build shared
+# objects with it. But libiberty does not honour the --enable-shared and
+# --disable-static flags; it only ever builds a static library no matter
+# what. So we must force -fPIC in build flags.
+HOST_LIBIBERTY_CONF_ENV = \
+	CFLAGS="$(HOST_CFLAGS) -fPIC" \
+	LDFLAGS="$(HOST_LDFLAGS) -fPIC"
+
+$(eval $(host-autotools-package))
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 2/4] package/gdb: depend on libiberty
  2020-02-07  2:38 [Buildroot] [PATCH v16 0/4] package/gobject-introspection: new package aduskett at gmail.com
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 1/4] package/libiberty: " aduskett at gmail.com
@ 2020-02-07  2:38 ` aduskett at gmail.com
  2020-02-07 21:45   ` Giulio Benetti
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 3/4] package/prelink-cross: new package aduskett at gmail.com
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 11+ messages in thread
From: aduskett at gmail.com @ 2020-02-07  2:38 UTC (permalink / raw)
  To: buildroot

From: Adam Duskett <Aduskett@gmail.com>

If present, GDB may use a system installed libiberty. As such, we must ensure
that host-libiberty is installed first.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
v13 -> v14:
  - Fix typo in the comment. (Arnout)

v1 -> v11:
  - Add this patch to the series

 package/gdb/gdb.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 46d745a897..01f7e14460 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -35,7 +35,9 @@ endif
 # For the host variant, we really want to build with XML support,
 # which is needed to read XML descriptions of target architectures. We
 # also need ncurses.
-HOST_GDB_DEPENDENCIES = host-expat host-ncurses
+# As for libiberty, gdb may use a system-installed one if present, so
+# we must ensure ours is installed first.
+HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses
 
 # Disable building documentation
 GDB_MAKE_OPTS += MAKEINFO=true
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 3/4] package/prelink-cross: new package
  2020-02-07  2:38 [Buildroot] [PATCH v16 0/4] package/gobject-introspection: new package aduskett at gmail.com
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 1/4] package/libiberty: " aduskett at gmail.com
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 2/4] package/gdb: depend on libiberty aduskett at gmail.com
@ 2020-02-07  2:38 ` aduskett at gmail.com
  2020-02-07 21:45   ` Giulio Benetti
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 4/4] package/gobject-introspection: " aduskett at gmail.com
  2020-02-07 21:34 ` [Buildroot] [PATCH v16 0/4] " Giulio Benetti
  4 siblings, 1 reply; 11+ messages in thread
From: aduskett at gmail.com @ 2020-02-07  2:38 UTC (permalink / raw)
  To: buildroot

From: Adam Duskett <Aduskett@gmail.com>

Prelink-cross emulates a runtime linker for a given sysroot. This is
necessary to allow gobject-introspection to build its typelib files
during cross-compiling.

We're using a sha1 on the cross_prelink branch, as we need the
RTLD-enabled variant of prelink-cross.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
Changes v11 -> v13:
  - Change version to a853a5d715d84eec93aa68e8f2df26b7d860f5b2 as the commit
    id b10e14218646d8b74773b82b0f8b395bce698fa2 no longer exists.
 
Changes v10 -> v11:
  - adopted by Yann
  - switch to a https git server
  - drop the Config.in.host entry
  - fix typo in commit log

Changes v9 -> v10:
  - None

Changes v8 -> v9:
  - Add the package to the DEVELOPERS file under my name.
  - Bump version to a853a5d715d84eec93aa68e8f2df26b7d860f5b2
  - Add host-elfutils as a dependency.

Changes v7 -> v8:
  - None

Changes v1 -> v7:
  - Add patch to series.

 DEVELOPERS                               |  1 +
 package/prelink-cross/prelink-cross.hash |  3 +++
 package/prelink-cross/prelink-cross.mk   | 16 ++++++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 package/prelink-cross/prelink-cross.hash
 create mode 100644 package/prelink-cross/prelink-cross.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index 79ddddd9c3..7db172d45f 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -53,6 +53,7 @@ F:	package/openjdk/
 F:	package/openjdk-bin/
 F:	package/php/
 F:	package/policycoreutils/
+F:	package/prelink-cross/
 F:	package/polkit/
 F:	package/python3/
 F:	package/python-aioredis/
diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash
new file mode 100644
index 0000000000..3ac33ac3d0
--- /dev/null
+++ b/package/prelink-cross/prelink-cross.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256  cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e  prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz
+sha256  b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf  COPYING
diff --git a/package/prelink-cross/prelink-cross.mk b/package/prelink-cross/prelink-cross.mk
new file mode 100644
index 0000000000..b43c209b16
--- /dev/null
+++ b/package/prelink-cross/prelink-cross.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# host-prelink-cross
+#
+################################################################################
+
+HOST_PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2
+HOST_PRELINK_CROSS_SITE = https://git.yoctoproject.org/git/prelink-cross
+HOST_PRELINK_CROSS_SITE_METHOD = git
+HOST_PRELINK_CROSS_LICENSE = GPL-2.0
+HOST_PRELINK_CROSS_LICENSE_FILES = COPYING
+# Sources from git, no configure script present
+HOST_PRELINK_CROSS_AUTORECONF = YES
+HOST_PRELINK_CROSS_DEPENDENCIES = host-elfutils host-libiberty
+
+$(eval $(host-autotools-package))
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 4/4] package/gobject-introspection: new package
  2020-02-07  2:38 [Buildroot] [PATCH v16 0/4] package/gobject-introspection: new package aduskett at gmail.com
                   ` (2 preceding siblings ...)
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 3/4] package/prelink-cross: new package aduskett at gmail.com
@ 2020-02-07  2:38 ` aduskett at gmail.com
  2020-02-07 21:45   ` Giulio Benetti
  2020-02-07 21:34 ` [Buildroot] [PATCH v16 0/4] " Giulio Benetti
  4 siblings, 1 reply; 11+ messages in thread
From: aduskett at gmail.com @ 2020-02-07  2:38 UTC (permalink / raw)
  To: buildroot

From: Adam Duskett <Aduskett@gmail.com>

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.

There's an XML format called GIR used by GObject-Introspection.
The purpose of it is to provide a standard structure to access the complete
available API that a library or other unit of code exports. It's
language-agnostic using namespaces to separate core, language, or
library-specific functionality.

Cross-compiling gobject-introspection is not an easy task. The main issue is
that in the process of creating the XML files, gobject-introspection must first
run and scan the binary, which, if the binary is cross-compiled, would not
typically be possible from the host system.

Because of this limitation, we use several wrappers to call instead first out
qemu, which runs the native scanner to create the binaries.

There are seven total patches and four different wrapper files needed to
successfully cross-compile and run this package, many of them are from
open-embedded, but one of them is of my own doing.

1) Revert a previous, incomplete attempt at adding cross-compiling support.

2) Add support for cross-compiling with meson.

3) Disable tests.

4) Add an option to use a binary wrapper; this patch will force giscanner to
   use a wrapper executable to run binaries it's producing, instead of
   attempting to run them from the host.

5) Add an option to use an LDD wrapper, again, useful for cross-compiled
   environments.

6) Add a --lib-dirs-envar option to pass to giscanner. (See patch for details.)

7) Add rpath-links to ccompiler: when passing the PACKAGE_GIR_EXTRA_LIBS_PATH
   to the ccompiler.py script, ccompiler.py needs to add -Wl,-rpath-link to the
   environment for the package to correctly link against the passed on paths.

8) Ignore error return codes from ldd-wrapper because prelink-rtld returns 127
   when it can't find a library, which breaks subprocess.check_output().

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
Changes v15 -> v16:
  - Re-added missing Config.in entry.
  - Removed a set -x in g-ir-scanner-wrapper
  - Fixed paths in g-ir-compiler.in
  - Removed GOBJECT_INTROSPECTION_PC_FILE_FIXUP in gobject-introspection.mk
    because the toolsdir entry no longer exists in the .pc file.
  - Cleaned up the grammar in the commit message.

Changes v14 -> v15:
  - Fixed number of patches in commit message. (Arnout)
  - Fixed license information (Adam)
  - Sorted dependencies (Arnout)
  - Removed redundant comment (Arnout)
  - Reordered host and target macros (Arnout)
  - Moved wrappers and wrapper installation logic to the host dir. (Arnout)
  - Combined the find functions in the target_finalize_hooks. (Arnout)
  

Changes v13 -> v14:
  - Bump to version 1.62.0

Changes v10 -> v11:
  - reorder config.in entries: arch deps first, then toolchain deps
    and order packages deps alphabetically (Yann)
  - drop dependency on threads, wchar, and !static: it's implicit from
    glibc (Yann)
  - Bump to version 1.60.2
  - Switched to a meson build system as autotools is no longer supported with
    gobject-introspection 1.60.x.
  - Removed the following patches that are no longer needed:
      - 0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
      - 0005-user-PYTHON_CONFIG-to-find-includes.patch
      - 0008-fix-gobject-pc.file.patch
  - Add the following patches:
      - 0002-add-cross-compilation-support-to-meson.patch
      - 0003-meson.build-disable-tests-when-cross-compiling.patch
      - 0008-ignore-error-return-codes-from-ldd-wrapper.patch

Changes v9 -> v10:
  - Makefile cleanup
  - Fix license syntax (Thomas)
  - Add libffi as a mandatory dependency (Thomas)
  - remove --disalbe-static (Thomas)
  - add --with-cairo if the cairo package is selected (Thomas)
  - Change PYTHON_INCLUDES to PYTHON_CONFIG in gobject-introspection.mk
    (Thomas)
  - Use | for all sed functions (Thomas)
  - Remove GOBJECT_INTROSPECTION_WRAPPERS (Thomas)
  - Add GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES target finalize
    hook. (Thomas)
  - Use $(dirname $0) in wrappers instead of $STAGING_DIR (Thomas)
  - Remove _GIR_EXTRA_LIBS_PATH in pkg-autotools.mk in favor of a
    seperate patch. (Thomas)

Changes v8 -> v9:
  - Create the $(STAGING_DIR)/usr/lib/gio/modules-dummy directory in the
    GOBJECT_INTROSPECTION_POST_PATCH_HOOKS to prevent qemu from
    segfaulting when g-ir-scanner-qemuwrapper is ran.
  - Remove the $(STAGING_DIR) prefix from gobject-introspection-1.0.pc
    to prevent pkg-config from appending a second staging_dir to the path
    of the g-ir-compiler. This prevents packages such a gstreamer1 from
    trying to call $(STAGING_DIR)/$(STAGING_DIR)/usr/bin/g-ir-compiler,
    which will break the build.

Changes v7 -> v8:
  - Add "select BR2_PACKAGE_HOST_PRELINK_CROSS" to Config.in

Changes v6 -> v7:
  - Remove the cross-ldd script in favor of the prelink-cross package.
  - Install the ldd and qemu wrappers in a post patch hook seperate of
    the other wrappers.
  - Set --enable-introspection-data in the configure options.

Changes v5 -> v6:
  - Update gobject-introspection to 1.56.1
  - Remove upstreamed 0008-add-Float128.patch

Changes v4 -> v5:
  - Added a more detailed commit message (Yann)
  - Removed  $HOST_DIR/bin/qemu- at HOST_QEMU_ARCH@ @HOST_QEMU_CPU_TUNE@
    in favor of @QEMU_USER@ (Thanks Yann)

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

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 or runtime, only compile time.

Changes v1 -> v2:
  - Fixed wrappers
  - Added 0007-giscanner-add-a-lib-dirs-envvar-option.patch
  - Added 0008-add-Float128.patch

 DEVELOPERS                                    |   1 +
 package/Config.in                             |   1 +
 ...lete-upstream-attempt-at-cross-compi.patch |  33 ++++
 ...d-cross-compilation-support-to-meson.patch | 163 ++++++++++++++++++
 .../0003-disable-tests.patch                  |  29 ++++
 ...canner-add-use-binary-wrapper-option.patch |  52 ++++++
 ...scanner-add-a-use-ldd-wrapper-option.patch |  48 ++++++
 ...scanner-add-a-lib-dirs-envvar-option.patch |  73 ++++++++
 .../0007-Add-rpath-links-to-ccompiler.patch   |  29 ++++
 ...-error-return-codes-from-ldd-wrapper.patch |  28 +++
 package/gobject-introspection/Config.in       |  33 ++++
 .../gobject-introspection/g-ir-compiler.in    |   3 +
 .../g-ir-scanner-lddwrapper.in                |   2 +
 .../g-ir-scanner-qemuwrapper.in               |  17 ++
 package/gobject-introspection/g-ir-scanner.in |   8 +
 .../gobject-introspection.hash                |   4 +
 .../gobject-introspection.mk                  | 116 +++++++++++++
 17 files changed, 640 insertions(+)
 create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
 create mode 100644 package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
 create mode 100644 package/gobject-introspection/0003-disable-tests.patch
 create mode 100644 package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
 create mode 100644 package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.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-ignore-error-return-codes-from-ldd-wrapper.patch
 create mode 100644 package/gobject-introspection/Config.in
 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 7db172d45f..e17fece9a6 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -31,6 +31,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/package/Config.in b/package/Config.in
index bad4f9cba6..0132bc763a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1774,6 +1774,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..1e8bd3518a
--- /dev/null
+++ b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
@@ -0,0 +1,33 @@
+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/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
+index 1134f33..9bdc2bc 100644
+--- a/giscanner/gdumpparser.py
++++ b/giscanner/gdumpparser.py
+@@ -156,12 +156,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-add-cross-compilation-support-to-meson.patch b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
new file mode 100644
index 0000000000..5e3ac59dd9
--- /dev/null
+++ b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
@@ -0,0 +1,163 @@
+From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 15 Nov 2018 15:10:05 +0100
+Subject: [PATCH] add cross-compilation support to meson
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ gir/meson.build   | 62 ++++++++++++++++++++++++++++++++++-------------
+ meson.build       |  4 ++-
+ meson_options.txt | 20 +++++++++++++++
+ 3 files changed, 68 insertions(+), 18 deletions(-)
+
+diff --git a/gir/meson.build b/gir/meson.build
+index 85ae575..327c134 100644
+--- a/gir/meson.build
++++ b/gir/meson.build
+@@ -36,16 +36,29 @@ gir_files = [
+ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
+ install_data(gir_files, install_dir: girdir)
+ 
+-scanner_command = [
+-  python,
+-  girscanner,
+-  '--output=@OUTPUT@',
+-  '--no-libtool',
+-  '--quiet',
+-  '--reparse-validate',
+-  '--add-include-path', join_paths(meson.current_build_dir()),
+-  '--add-include-path', join_paths(meson.current_source_dir()),
+-]
++if get_option('enable-host-gi')
++    scanner_command = [
++      'g-ir-scanner',
++      '--output=@OUTPUT@',
++      '--no-libtool',
++      '--quiet',
++      '--reparse-validate',
++      '--add-include-path', join_paths(meson.current_build_dir()),
++      '--add-include-path', join_paths(meson.current_source_dir()),
++    ]
++else
++    scanner_command = [
++      python,
++      girscanner,
++      '--output=@OUTPUT@',
++      '--no-libtool',
++      '--quiet',
++      '--reparse-validate',
++      '--add-include-path', join_paths(meson.current_build_dir()),
++      '--add-include-path', join_paths(meson.current_source_dir()),
++    ]
++endif
++
+ 
+ dep_type = glib_dep.type_name()
+ if dep_type == 'internal'
+@@ -58,6 +71,12 @@ if dep_type == 'internal'
+                       '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
+ endif
+ 
++if get_option('enable-gi-cross-wrapper') != ''
++  scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')]
++endif
++if get_option('enable-gi-ldd-wrapper') != ''
++  scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')]
++endif
+ # Take a glob and print to newlines
+ globber = '''
+ from glob import glob
+@@ -84,8 +103,8 @@ glib_command = scanner_command + [
+ 
+ if dep_type == 'pkgconfig'
+   glib_command += ['--external-library', '--pkg=glib-2.0']
+-  glib_libdir = glib_dep.get_pkgconfig_variable('libdir')
+-  glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
++  glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir')
++  glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
+   glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
+   glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
+   glib_files += join_paths(glib_libincdir, 'glibconfig.h')
+@@ -339,7 +358,7 @@ endforeach
+ if giounix_dep.found()
+   if dep_type == 'pkgconfig'
+     gio_command += ['--pkg=gio-unix-2.0']
+-    giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
++    giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
+     # Get the installed gio-unix header list
+     ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
+     if ret.returncode() != 0
+@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
+ )
+ 
+ typelibs = []
++if get_option('enable-gi-cross-wrapper') != ''
++    gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@',
++              '--includedir', meson.current_build_dir(),
++              '--includedir', meson.current_source_dir(),
++    ]
++else
++    gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
++              '--includedir', meson.current_build_dir(),
++              '--includedir', meson.current_source_dir(),
++    ]
++endif
++
+ foreach gir : gir_files
+   typelibs += custom_target('generate-typelib- at 0@'.format(gir).underscorify(),
+     input: gir,
+     output: '@BASENAME at .typelib',
+     depends: [gobject_gir, ],
+-    command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
+-              '--includedir', meson.current_build_dir(),
+-              '--includedir', meson.current_source_dir(),
+-    ],
++    command: gircompiler_command,
+     install: true,
+     install_dir: typelibdir,
+   )
+diff --git a/meson.build b/meson.build
+index 95bbd2b..f7baefd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -163,7 +163,9 @@ endif
+ subdir('girepository')
+ subdir('tools')
+ subdir('giscanner')
+-subdir('gir')
++if get_option('enable-introspection-data') == true
++    subdir('gir')
++endif
+ subdir('examples')
+ subdir('docs')
+ subdir('tests')
+diff --git a/meson_options.txt b/meson_options.txt
+index 445a68a..a325511 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3',
+ option('gir_dir_prefix', type: 'string',
+   description: 'Intermediate prefix for gir installation under ${prefix}'
+ )
++
++option('enable-host-gi', type: 'boolean', value : false,
++  description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)'
++)
++
++option('enable-gi-cross-wrapper', type: 'string',
++  description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)'
++)
++
++option('enable-gi-ldd-wrapper', type: 'string',
++  description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)'
++)
++
++option('enable-introspection-data', type: 'boolean', value : true,
++  description: 'Build introspection data (.gir and .typelib files) in addition to library and tools'
++)
++
++option('pkgconfig-sysroot-path', type: 'string',
++  description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)'
++)
diff --git a/package/gobject-introspection/0003-disable-tests.patch b/package/gobject-introspection/0003-disable-tests.patch
new file mode 100644
index 0000000000..fcc5a794f3
--- /dev/null
+++ b/package/gobject-introspection/0003-disable-tests.patch
@@ -0,0 +1,29 @@
+From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Mon, 3 Feb 2020 10:07:15 -0800
+Subject: [PATCH] disable tests
+
+If introspection data on the host is not built, meson throws the error:
+"Unknown variable "typelibs". Because tests are not required, removing
+the subdir tests alltogether fixes this issue.
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a5e825f..981e936 100644
+--- a/meson.build
++++ b/meson.build
+@@ -171,7 +171,6 @@ subdir('giscanner')
+ subdir('gir')
+ subdir('examples')
+ subdir('docs')
+-subdir('tests')
+ 
+ install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
+ install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
+-- 
+2.24.1
+
diff --git a/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch b/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
new file mode 100644
index 0000000000..cffc2d954d
--- /dev/null
+++ b/package/gobject-introspection/0004-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
+@@ -120,6 +120,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")
+@@ -417,6 +420,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/0005-giscanner-add-a-use-ldd-wrapper-option.patch b/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch
new file mode 100644
index 0000000000..386c1c34b0
--- /dev/null
+++ b/package/gobject-introspection/0005-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
+@@ -123,6 +123,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
+@@ -97,7 +97,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/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..06f5635610
--- /dev/null
+++ b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
@@ -0,0 +1,73 @@
+From 3a9b3d8179b7eb9d2cc93da31578945bc03a45c3 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 27 Apr 2018 12:56:15 -0400
+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>
+Signed-off-by: Adam Duskett <aduskett@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 d10327c..6cf25d5 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -174,7 +174,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.
+ 
+@@ -184,7 +184,7 @@ class CCompiler(object):
+         if os.name == 'nt':
+             runtime_path_envvar = ['LIB', 'PATH']
+         else:
+-            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
++            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_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 3c7220b..0abd565 100644
+--- a/giscanner/dumper.py
++++ b/giscanner/dumper.py
+@@ -244,7 +244,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 d262785..51c9570 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -126,6 +126,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.14.3
+
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..08835d3ecc
--- /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
+@@ -229,6 +229,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-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch
new file mode 100644
index 0000000000..568758d332
--- /dev/null
+++ b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch
@@ -0,0 +1,28 @@
+From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 5 Sep 2018 16:46:52 +0200
+Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
+
+prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
+It is not an error per se, but it breaks subprocess.check_output().
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/shlibs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index d67df95..80352a6 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries):
+             args.extend(['otool', '-L', binary.args[0]])
+         else:
+             args.extend(['ldd', binary.args[0]])
+-        output = subprocess.check_output(args)
++        output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
+         if isinstance(output, bytes):
+             output = output.decode("utf-8", "replace")
+ 
diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in
new file mode 100644
index 0000000000..ecb4f048f3
--- /dev/null
+++ b/package/gobject-introspection/Config.in
@@ -0,0 +1,33 @@
+config BR2_PACKAGE_GOBJECT_INTROSPECTION
+	bool "gobject-introspection"
+	# While gcc 4.8 might be compatible with gobject-introspection,
+	# The autobuilders use some toolchains from codesourcery which
+	# have gcc 4.8 and a very old version of glibc, which will cause
+	# compile errors with locale.c. As such, require 4.9 until this
+	# can be verified.
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on BR2_USE_MMU # python3, libglib2
+	depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_HOST_PRELINK_CROSS
+	select BR2_PACKAGE_HOST_QEMU
+	select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
+	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_ZLIB
+	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, gcc >= 4.9"
+	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in
new file mode 100644
index 0000000000..a88fde7aa9
--- /dev/null
+++ b/package/gobject-introspection/g-ir-compiler.in
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/bin/g-ir-compiler "$@"
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..3095414f69
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/ "$@"
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..0b7a51d18b
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+
+# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel
+# is older than the target kernel.
+# 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
+GIO_MODULE_DIR=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/lib/gio/modules-dummy \
+ at QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \
+-L $(dirname $0)/../@GNU_TARGET_NAME@/sysroot/ \
+-E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/lib:$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/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..9ce5b4b425
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner.in
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+export GI_SCANNER_DISABLE_CACHE=1
+$HOST_DIR/bin/g-ir-scanner.real \
+--lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \
+--use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \
+--use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \
+--add-include-path=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/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..0454c59565
--- /dev/null
+++ b/package/gobject-introspection/gobject-introspection.hash
@@ -0,0 +1,4 @@
+#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.sha256sum
+sha256 b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2 gobject-introspection-1.62.0.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..003a1eb259
--- /dev/null
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -0,0 +1,115 @@
+################################################################################
+#
+# gobject-introspection
+#
+################################################################################
+
+GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.62
+GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
+GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
+GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
+GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
+GOBJECT_INTROSPECTION_AUTORECONF = YES
+GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause
+GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l
+
+GOBJECT_INTROSPECTION_DEPENDENCIES = \
+	host-autoconf-archive \
+	host-gobject-introspection \
+	host-prelink-cross \
+	host-qemu \
+	libffi \
+	libglib2 \
+	python3 \
+	zlib
+
+HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \
+	host-bison \
+	host-flex \
+	host-libglib2 \
+	host-python3
+
+# g-ir-scanner will default to /usr/bin/ld for linking if this is not set.
+GOBJECT_INTROSPECTION_NINJA_ENV += \
+	CC="$(TARGET_CC)"
+
+# Disable introspection data on the host, as it is not needed and
+# the package will attempt to use the systems libglib2 which will fail
+# if the systems libglib2 version is older than 2.60.
+HOST_GOBJECT_INTROSPECTION_CONF_OPTS = \
+	-Denable-introspection-data=false
+
+# Use the host gi-scanner to prevent the scanner from generating incorrect
+# elf classes.
+GOBJECT_INTROSPECTION_CONF_OPTS = \
+	-Denable-host-gi=true \
+	-Denable-gi-cross-wrapper="$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \
+	-Denable-gi-ldd-wrapper="$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
+	-Denable-introspection-data=true
+
+ifeq ($(BR2_PACKAGE_CAIRO),y)
+GOBJECT_INTROSPECTION_DEPENDENCIES += cairo
+GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=true
+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
+
+HOST_GOBJECT_INTROSPECTION_CONF_ENV = \
+	GI_SCANNER_DISABLE_CACHE=1
+
+# Make sure g-ir-tool-template uses the host python.
+define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+	$(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
+endef
+GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+
+# These wrappers allow gobject-introspection to build the internal introspection
+# libraries during the build process.
+define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
+	mv $(HOST_DIR)/usr/bin/g-ir-scanner $(HOST_DIR)/usr/bin/g-ir-scanner.real
+
+	$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \
+		$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper
+	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
+		$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper
+
+	$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \
+		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+	$(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \
+		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+	$(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \
+		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
+		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+
+	$(INSTALL) -D -m 755 \
+		$(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-compiler.in $(HOST_DIR)/usr/bin/g-ir-compiler
+	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
+		$(HOST_DIR)/usr/bin/g-ir-compiler
+
+	$(INSTALL) -D -m 755 \
+		$(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner.in $(HOST_DIR)/usr/bin/g-ir-scanner
+	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
+		$(HOST_DIR)/usr/bin/g-ir-scanner
+
+endef
+HOST_GOBJECT_INTROSPECTION_POST_INSTALL_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
+
+define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
+	# 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
+	mkdir -p $(STAGING_DIR)/usr/lib/gio/modules-dummy
+endef
+GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
+
+# Only .typelib files are needed to run.
+define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
+	find $(TARGET_DIR)/usr/share \( -iname "*.gir" -o -iname \*.rnc \) -delete
+endef
+GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
+
+$(eval $(meson-package))
+$(eval $(host-meson-package))
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 0/4] package/gobject-introspection: new package
  2020-02-07  2:38 [Buildroot] [PATCH v16 0/4] package/gobject-introspection: new package aduskett at gmail.com
                   ` (3 preceding siblings ...)
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 4/4] package/gobject-introspection: " aduskett at gmail.com
@ 2020-02-07 21:34 ` Giulio Benetti
  4 siblings, 0 replies; 11+ messages in thread
From: Giulio Benetti @ 2020-02-07 21:34 UTC (permalink / raw)
  To: buildroot

Hi Adam, All,

I've built succesfully gobject-introspection with test-pkg -a, so I'm 
going to send Tested-by: for every patch.

Best regards
-- 
Giulio Benetti
Benetti Engineering sas

On 2/7/20 3:38 AM, aduskett at gmail.com wrote:
> From: Adam Duskett <Aduskett@gmail.com>
> 
> This time, with 100% more working.
> 
> My brain didn't work so well at Devdays apparently:
> 
> Changes:
>    - Add gobject-introspection back into Config.in. I'm bad and somehow missed
>      this in v15.
>    
>    - Remove GOBJECT_INTROSPECTION_PC_FILE_FIXUP in goi.mk, as the sed wasn't
>      doing anything.
>    
>    - Paths in g-ir-compiler.in weren't 100% correct due to moving g-ir-compiler
>      to the host directory, so qemu was trying to load the host compiler and not
>      the staging compiler, which would cause qemu to puke.
> 
>    - I removed a -x in g-ir-scanner-wrapper because I am blind.
>    
> I tested this patch series with gstreamer1, and it works! You, too, can now
> have high-functioning projects use glib based c libraries! Hooray!
> 
> Thanks, everybody!
> 
> Adam
> Adam
> 
> Adam Duskett (4):
>    package/libiberty: new package
>    package/prelink-cross: new package
>    package/gdb: depend on libiberty
>    package/gobject-introspection: new package
> 
>   DEVELOPERS                                    |   3 +
>   package/Config.in                             |   1 +
>   package/gdb/gdb.mk                            |   4 +-
>   ...lete-upstream-attempt-at-cross-compi.patch |  33 ++++
>   ...d-cross-compilation-support-to-meson.patch | 163 ++++++++++++++++++
>   .../0003-disable-tests.patch                  |  29 ++++
>   ...canner-add-use-binary-wrapper-option.patch |  52 ++++++
>   ...scanner-add-a-use-ldd-wrapper-option.patch |  48 ++++++
>   ...scanner-add-a-lib-dirs-envvar-option.patch |  73 ++++++++
>   .../0007-Add-rpath-links-to-ccompiler.patch   |  29 ++++
>   ...-error-return-codes-from-ldd-wrapper.patch |  28 +++
>   package/gobject-introspection/Config.in       |  33 ++++
>   .../gobject-introspection/g-ir-compiler.in    |   3 +
>   .../g-ir-scanner-lddwrapper.in                |   2 +
>   .../g-ir-scanner-qemuwrapper.in               |  17 ++
>   package/gobject-introspection/g-ir-scanner.in |   8 +
>   .../gobject-introspection.hash                |   4 +
>   .../gobject-introspection.mk                  | 116 +++++++++++++
>   package/libiberty/libiberty.hash              |   2 +
>   package/libiberty/libiberty.mk                |  27 +++
>   package/prelink-cross/prelink-cross.hash      |   3 +
>   package/prelink-cross/prelink-cross.mk        |  16 ++
>   22 files changed, 693 insertions(+), 1 deletion(-)
>   create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
>   create mode 100644 package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
>   create mode 100644 package/gobject-introspection/0003-disable-tests.patch
>   create mode 100644 package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
>   create mode 100644 package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.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-ignore-error-return-codes-from-ldd-wrapper.patch
>   create mode 100644 package/gobject-introspection/Config.in
>   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/libiberty/libiberty.hash
>   create mode 100644 package/libiberty/libiberty.mk
>   create mode 100644 package/prelink-cross/prelink-cross.hash
>   create mode 100644 package/prelink-cross/prelink-cross.mk
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 1/4] package/libiberty: new package
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 1/4] package/libiberty: " aduskett at gmail.com
@ 2020-02-07 21:44   ` Giulio Benetti
  0 siblings, 0 replies; 11+ messages in thread
From: Giulio Benetti @ 2020-02-07 21:44 UTC (permalink / raw)
  To: buildroot

Hi Adam, All,

On 2/7/20 3:38 AM, aduskett at gmail.com wrote:
> From: Adam Duskett <Aduskett@gmail.com>
> 
> Some packages, like prelink-cross, want to use libiberty but do not bundle
> their own instance (which is good!).
> 
> However, libiberty is made for being bundled in packages: all GNU
> packages that use libiberty (gcc, Binutils, gdb, et al...) all have their own
> bundled variant. This common practice means that there is no official upstream
> for libiberty, the closest being as part of the combined Binutils-gdb tree.
> 
> So we introduce a new host-only package, that installs just libiberty from a
> Binutils released tarball.
> 
> Again, as packages usually bundle libiberty, it usually only installs a static
> version. Furthermore, it does not obey the usual --enable-shared and
> --disable-static flags; it only ever builds a static version.
> 
> Furthermore, -fPIC is not used with this library, but some packages may pick it
> to build shared objects. This behavior is the case for host-gdb, for example,
> which accidentally picks that library instead of its internal one.
> 
> So, rather than fix the various gdb versions and variants we can use, we ensure
> that the libiberty we install is usable in shared objects, and we always build
> before host-gdb.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>

Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

> ---
> Changes v15 -> v16:
>    - Cleaned up the grammar in the commit message.
> 
> Changes v1 -> v15:
>    - Add this patch to the series
> 
>   DEVELOPERS                       |  1 +
>   package/libiberty/libiberty.hash |  2 ++
>   package/libiberty/libiberty.mk   | 27 +++++++++++++++++++++++++++
>   3 files changed, 30 insertions(+)
>   create mode 100644 package/libiberty/libiberty.hash
>   create mode 100644 package/libiberty/libiberty.mk
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index d8ea23e0b3..79ddddd9c3 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -2552,6 +2552,7 @@ F:	package/keyutils/
>   F:	package/libbsd/
>   F:	package/libedit/
>   F:	package/libgsm/
> +F:	package/libiberty/
>   F:	package/libinput/
>   F:	package/libiscsi/
>   F:	package/libpri/
> diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash
> new file mode 100644
> index 0000000000..270f38dfa7
> --- /dev/null
> +++ b/package/libiberty/libiberty.hash
> @@ -0,0 +1,2 @@
> +# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum
> +sha512  d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a  binutils-2.32.tar.xz
> diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk
> new file mode 100644
> index 0000000000..17976fdd4f
> --- /dev/null
> +++ b/package/libiberty/libiberty.mk
> @@ -0,0 +1,27 @@
> +################################################################################
> +#
> +# libiberty
> +#
> +################################################################################
> +
> +LIBIBERTY_VERSION = 2.32
> +LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz
> +LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils
> +LIBIBERTY_DL_SUBDIR = binutils
> +LIBIBERTY_SUBDIR = libiberty
> +
> +# We explicitly disable multilib, as we do in binutils.
> +# By default, libiberty installs nothing, so we must force it.
> +HOST_LIBIBERTY_CONF_OPTS = \
> +	--disable-multilib \
> +	--enable-install-libiberty
> +
> +# Some packages (e.g. host-gdb) will pick this library and build shared
> +# objects with it. But libiberty does not honour the --enable-shared and
> +# --disable-static flags; it only ever builds a static library no matter
> +# what. So we must force -fPIC in build flags.
> +HOST_LIBIBERTY_CONF_ENV = \
> +	CFLAGS="$(HOST_CFLAGS) -fPIC" \
> +	LDFLAGS="$(HOST_LDFLAGS) -fPIC"
> +
> +$(eval $(host-autotools-package))
> 

-- 
Giulio Benetti
Benetti Engineering sas

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 2/4] package/gdb: depend on libiberty
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 2/4] package/gdb: depend on libiberty aduskett at gmail.com
@ 2020-02-07 21:45   ` Giulio Benetti
  0 siblings, 0 replies; 11+ messages in thread
From: Giulio Benetti @ 2020-02-07 21:45 UTC (permalink / raw)
  To: buildroot

Hi Adam, All,

On 2/7/20 3:38 AM, aduskett at gmail.com wrote:
> From: Adam Duskett <Aduskett@gmail.com>
> 
> If present, GDB may use a system installed libiberty. As such, we must ensure
> that host-libiberty is installed first.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>

Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

> ---
> v13 -> v14:
>    - Fix typo in the comment. (Arnout)
> 
> v1 -> v11:
>    - Add this patch to the series
> 
>   package/gdb/gdb.mk | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
> index 46d745a897..01f7e14460 100644
> --- a/package/gdb/gdb.mk
> +++ b/package/gdb/gdb.mk
> @@ -35,7 +35,9 @@ endif
>   # For the host variant, we really want to build with XML support,
>   # which is needed to read XML descriptions of target architectures. We
>   # also need ncurses.
> -HOST_GDB_DEPENDENCIES = host-expat host-ncurses
> +# As for libiberty, gdb may use a system-installed one if present, so
> +# we must ensure ours is installed first.
> +HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses
>   
>   # Disable building documentation
>   GDB_MAKE_OPTS += MAKEINFO=true
> 

-- 
Giulio Benetti
Benetti Engineering sas

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 3/4] package/prelink-cross: new package
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 3/4] package/prelink-cross: new package aduskett at gmail.com
@ 2020-02-07 21:45   ` Giulio Benetti
  0 siblings, 0 replies; 11+ messages in thread
From: Giulio Benetti @ 2020-02-07 21:45 UTC (permalink / raw)
  To: buildroot

Hi Adam, All,

On 2/7/20 3:38 AM, aduskett at gmail.com wrote:
> From: Adam Duskett <Aduskett@gmail.com>
> 
> Prelink-cross emulates a runtime linker for a given sysroot. This is
> necessary to allow gobject-introspection to build its typelib files
> during cross-compiling.
> 
> We're using a sha1 on the cross_prelink branch, as we need the
> RTLD-enabled variant of prelink-cross.
> 
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>

Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

> ---
> Changes v11 -> v13:
>    - Change version to a853a5d715d84eec93aa68e8f2df26b7d860f5b2 as the commit
>      id b10e14218646d8b74773b82b0f8b395bce698fa2 no longer exists.
>   
> Changes v10 -> v11:
>    - adopted by Yann
>    - switch to a https git server
>    - drop the Config.in.host entry
>    - fix typo in commit log
> 
> Changes v9 -> v10:
>    - None
> 
> Changes v8 -> v9:
>    - Add the package to the DEVELOPERS file under my name.
>    - Bump version to a853a5d715d84eec93aa68e8f2df26b7d860f5b2
>    - Add host-elfutils as a dependency.
> 
> Changes v7 -> v8:
>    - None
> 
> Changes v1 -> v7:
>    - Add patch to series.
> 
>   DEVELOPERS                               |  1 +
>   package/prelink-cross/prelink-cross.hash |  3 +++
>   package/prelink-cross/prelink-cross.mk   | 16 ++++++++++++++++
>   3 files changed, 20 insertions(+)
>   create mode 100644 package/prelink-cross/prelink-cross.hash
>   create mode 100644 package/prelink-cross/prelink-cross.mk
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 79ddddd9c3..7db172d45f 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -53,6 +53,7 @@ F:	package/openjdk/
>   F:	package/openjdk-bin/
>   F:	package/php/
>   F:	package/policycoreutils/
> +F:	package/prelink-cross/
>   F:	package/polkit/
>   F:	package/python3/
>   F:	package/python-aioredis/
> diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash
> new file mode 100644
> index 0000000000..3ac33ac3d0
> --- /dev/null
> +++ b/package/prelink-cross/prelink-cross.hash
> @@ -0,0 +1,3 @@
> +# Locally computed
> +sha256  cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e  prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz
> +sha256  b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf  COPYING
> diff --git a/package/prelink-cross/prelink-cross.mk b/package/prelink-cross/prelink-cross.mk
> new file mode 100644
> index 0000000000..b43c209b16
> --- /dev/null
> +++ b/package/prelink-cross/prelink-cross.mk
> @@ -0,0 +1,16 @@
> +################################################################################
> +#
> +# host-prelink-cross
> +#
> +################################################################################
> +
> +HOST_PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2
> +HOST_PRELINK_CROSS_SITE = https://git.yoctoproject.org/git/prelink-cross
> +HOST_PRELINK_CROSS_SITE_METHOD = git
> +HOST_PRELINK_CROSS_LICENSE = GPL-2.0
> +HOST_PRELINK_CROSS_LICENSE_FILES = COPYING
> +# Sources from git, no configure script present
> +HOST_PRELINK_CROSS_AUTORECONF = YES
> +HOST_PRELINK_CROSS_DEPENDENCIES = host-elfutils host-libiberty
> +
> +$(eval $(host-autotools-package))
> 

-- 
Giulio Benetti
Benetti Engineering sas

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 4/4] package/gobject-introspection: new package
  2020-02-07  2:38 ` [Buildroot] [PATCH v16 4/4] package/gobject-introspection: " aduskett at gmail.com
@ 2020-02-07 21:45   ` Giulio Benetti
  2020-02-08 19:14     ` Giulio Benetti
  0 siblings, 1 reply; 11+ messages in thread
From: Giulio Benetti @ 2020-02-07 21:45 UTC (permalink / raw)
  To: buildroot

Hi Adam, All,

On 2/7/20 3:38 AM, aduskett at gmail.com wrote:
> From: Adam Duskett <Aduskett@gmail.com>
> 
> 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.
> 
> There's an XML format called GIR used by GObject-Introspection.
> The purpose of it is to provide a standard structure to access the complete
> available API that a library or other unit of code exports. It's
> language-agnostic using namespaces to separate core, language, or
> library-specific functionality.
> 
> Cross-compiling gobject-introspection is not an easy task. The main issue is
> that in the process of creating the XML files, gobject-introspection must first
> run and scan the binary, which, if the binary is cross-compiled, would not
> typically be possible from the host system.
> 
> Because of this limitation, we use several wrappers to call instead first out
> qemu, which runs the native scanner to create the binaries.
> 
> There are seven total patches and four different wrapper files needed to
> successfully cross-compile and run this package, many of them are from
> open-embedded, but one of them is of my own doing.
> 
> 1) Revert a previous, incomplete attempt at adding cross-compiling support.
> 
> 2) Add support for cross-compiling with meson.
> 
> 3) Disable tests.
> 
> 4) Add an option to use a binary wrapper; this patch will force giscanner to
>     use a wrapper executable to run binaries it's producing, instead of
>     attempting to run them from the host.
> 
> 5) Add an option to use an LDD wrapper, again, useful for cross-compiled
>     environments.
> 
> 6) Add a --lib-dirs-envar option to pass to giscanner. (See patch for details.)
> 
> 7) Add rpath-links to ccompiler: when passing the PACKAGE_GIR_EXTRA_LIBS_PATH
>     to the ccompiler.py script, ccompiler.py needs to add -Wl,-rpath-link to the
>     environment for the package to correctly link against the passed on paths.
> 
> 8) Ignore error return codes from ldd-wrapper because prelink-rtld returns 127
>     when it can't find a library, which breaks subprocess.check_output().
> 
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>

Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

> ---
> Changes v15 -> v16:
>    - Re-added missing Config.in entry.
>    - Removed a set -x in g-ir-scanner-wrapper
>    - Fixed paths in g-ir-compiler.in
>    - Removed GOBJECT_INTROSPECTION_PC_FILE_FIXUP in gobject-introspection.mk
>      because the toolsdir entry no longer exists in the .pc file.
>    - Cleaned up the grammar in the commit message.
> 
> Changes v14 -> v15:
>    - Fixed number of patches in commit message. (Arnout)
>    - Fixed license information (Adam)
>    - Sorted dependencies (Arnout)
>    - Removed redundant comment (Arnout)
>    - Reordered host and target macros (Arnout)
>    - Moved wrappers and wrapper installation logic to the host dir. (Arnout)
>    - Combined the find functions in the target_finalize_hooks. (Arnout)
>    
> 
> Changes v13 -> v14:
>    - Bump to version 1.62.0
> 
> Changes v10 -> v11:
>    - reorder config.in entries: arch deps first, then toolchain deps
>      and order packages deps alphabetically (Yann)
>    - drop dependency on threads, wchar, and !static: it's implicit from
>      glibc (Yann)
>    - Bump to version 1.60.2
>    - Switched to a meson build system as autotools is no longer supported with
>      gobject-introspection 1.60.x.
>    - Removed the following patches that are no longer needed:
>        - 0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
>        - 0005-user-PYTHON_CONFIG-to-find-includes.patch
>        - 0008-fix-gobject-pc.file.patch
>    - Add the following patches:
>        - 0002-add-cross-compilation-support-to-meson.patch
>        - 0003-meson.build-disable-tests-when-cross-compiling.patch
>        - 0008-ignore-error-return-codes-from-ldd-wrapper.patch
> 
> Changes v9 -> v10:
>    - Makefile cleanup
>    - Fix license syntax (Thomas)
>    - Add libffi as a mandatory dependency (Thomas)
>    - remove --disalbe-static (Thomas)
>    - add --with-cairo if the cairo package is selected (Thomas)
>    - Change PYTHON_INCLUDES to PYTHON_CONFIG in gobject-introspection.mk
>      (Thomas)
>    - Use | for all sed functions (Thomas)
>    - Remove GOBJECT_INTROSPECTION_WRAPPERS (Thomas)
>    - Add GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES target finalize
>      hook. (Thomas)
>    - Use $(dirname $0) in wrappers instead of $STAGING_DIR (Thomas)
>    - Remove _GIR_EXTRA_LIBS_PATH in pkg-autotools.mk in favor of a
>      seperate patch. (Thomas)
> 
> Changes v8 -> v9:
>    - Create the $(STAGING_DIR)/usr/lib/gio/modules-dummy directory in the
>      GOBJECT_INTROSPECTION_POST_PATCH_HOOKS to prevent qemu from
>      segfaulting when g-ir-scanner-qemuwrapper is ran.
>    - Remove the $(STAGING_DIR) prefix from gobject-introspection-1.0.pc
>      to prevent pkg-config from appending a second staging_dir to the path
>      of the g-ir-compiler. This prevents packages such a gstreamer1 from
>      trying to call $(STAGING_DIR)/$(STAGING_DIR)/usr/bin/g-ir-compiler,
>      which will break the build.
> 
> Changes v7 -> v8:
>    - Add "select BR2_PACKAGE_HOST_PRELINK_CROSS" to Config.in
> 
> Changes v6 -> v7:
>    - Remove the cross-ldd script in favor of the prelink-cross package.
>    - Install the ldd and qemu wrappers in a post patch hook seperate of
>      the other wrappers.
>    - Set --enable-introspection-data in the configure options.
> 
> Changes v5 -> v6:
>    - Update gobject-introspection to 1.56.1
>    - Remove upstreamed 0008-add-Float128.patch
> 
> Changes v4 -> v5:
>    - Added a more detailed commit message (Yann)
>    - Removed  $HOST_DIR/bin/qemu- at HOST_QEMU_ARCH@ @HOST_QEMU_CPU_TUNE@
>      in favor of @QEMU_USER@ (Thanks Yann)
> 
> 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
> 
> 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 or runtime, only compile time.
> 
> Changes v1 -> v2:
>    - Fixed wrappers
>    - Added 0007-giscanner-add-a-lib-dirs-envvar-option.patch
>    - Added 0008-add-Float128.patch
> 
>   DEVELOPERS                                    |   1 +
>   package/Config.in                             |   1 +
>   ...lete-upstream-attempt-at-cross-compi.patch |  33 ++++
>   ...d-cross-compilation-support-to-meson.patch | 163 ++++++++++++++++++
>   .../0003-disable-tests.patch                  |  29 ++++
>   ...canner-add-use-binary-wrapper-option.patch |  52 ++++++
>   ...scanner-add-a-use-ldd-wrapper-option.patch |  48 ++++++
>   ...scanner-add-a-lib-dirs-envvar-option.patch |  73 ++++++++
>   .../0007-Add-rpath-links-to-ccompiler.patch   |  29 ++++
>   ...-error-return-codes-from-ldd-wrapper.patch |  28 +++
>   package/gobject-introspection/Config.in       |  33 ++++
>   .../gobject-introspection/g-ir-compiler.in    |   3 +
>   .../g-ir-scanner-lddwrapper.in                |   2 +
>   .../g-ir-scanner-qemuwrapper.in               |  17 ++
>   package/gobject-introspection/g-ir-scanner.in |   8 +
>   .../gobject-introspection.hash                |   4 +
>   .../gobject-introspection.mk                  | 116 +++++++++++++
>   17 files changed, 640 insertions(+)
>   create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
>   create mode 100644 package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
>   create mode 100644 package/gobject-introspection/0003-disable-tests.patch
>   create mode 100644 package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
>   create mode 100644 package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.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-ignore-error-return-codes-from-ldd-wrapper.patch
>   create mode 100644 package/gobject-introspection/Config.in
>   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 7db172d45f..e17fece9a6 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -31,6 +31,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/package/Config.in b/package/Config.in
> index bad4f9cba6..0132bc763a 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1774,6 +1774,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..1e8bd3518a
> --- /dev/null
> +++ b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
> @@ -0,0 +1,33 @@
> +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/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
> +index 1134f33..9bdc2bc 100644
> +--- a/giscanner/gdumpparser.py
> ++++ b/giscanner/gdumpparser.py
> +@@ -156,12 +156,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-add-cross-compilation-support-to-meson.patch b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
> new file mode 100644
> index 0000000000..5e3ac59dd9
> --- /dev/null
> +++ b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
> @@ -0,0 +1,163 @@
> +From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Thu, 15 Nov 2018 15:10:05 +0100
> +Subject: [PATCH] add cross-compilation support to meson
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> + gir/meson.build   | 62 ++++++++++++++++++++++++++++++++++-------------
> + meson.build       |  4 ++-
> + meson_options.txt | 20 +++++++++++++++
> + 3 files changed, 68 insertions(+), 18 deletions(-)
> +
> +diff --git a/gir/meson.build b/gir/meson.build
> +index 85ae575..327c134 100644
> +--- a/gir/meson.build
> ++++ b/gir/meson.build
> +@@ -36,16 +36,29 @@ gir_files = [
> + typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
> + install_data(gir_files, install_dir: girdir)
> +
> +-scanner_command = [
> +-  python,
> +-  girscanner,
> +-  '--output=@OUTPUT@',
> +-  '--no-libtool',
> +-  '--quiet',
> +-  '--reparse-validate',
> +-  '--add-include-path', join_paths(meson.current_build_dir()),
> +-  '--add-include-path', join_paths(meson.current_source_dir()),
> +-]
> ++if get_option('enable-host-gi')
> ++    scanner_command = [
> ++      'g-ir-scanner',
> ++      '--output=@OUTPUT@',
> ++      '--no-libtool',
> ++      '--quiet',
> ++      '--reparse-validate',
> ++      '--add-include-path', join_paths(meson.current_build_dir()),
> ++      '--add-include-path', join_paths(meson.current_source_dir()),
> ++    ]
> ++else
> ++    scanner_command = [
> ++      python,
> ++      girscanner,
> ++      '--output=@OUTPUT@',
> ++      '--no-libtool',
> ++      '--quiet',
> ++      '--reparse-validate',
> ++      '--add-include-path', join_paths(meson.current_build_dir()),
> ++      '--add-include-path', join_paths(meson.current_source_dir()),
> ++    ]
> ++endif
> ++
> +
> + dep_type = glib_dep.type_name()
> + if dep_type == 'internal'
> +@@ -58,6 +71,12 @@ if dep_type == 'internal'
> +                       '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
> + endif
> +
> ++if get_option('enable-gi-cross-wrapper') != ''
> ++  scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')]
> ++endif
> ++if get_option('enable-gi-ldd-wrapper') != ''
> ++  scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')]
> ++endif
> + # Take a glob and print to newlines
> + globber = '''
> + from glob import glob
> +@@ -84,8 +103,8 @@ glib_command = scanner_command + [
> +
> + if dep_type == 'pkgconfig'
> +   glib_command += ['--external-library', '--pkg=glib-2.0']
> +-  glib_libdir = glib_dep.get_pkgconfig_variable('libdir')
> +-  glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
> ++  glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir')
> ++  glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
> +   glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
> +   glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
> +   glib_files += join_paths(glib_libincdir, 'glibconfig.h')
> +@@ -339,7 +358,7 @@ endforeach
> + if giounix_dep.found()
> +   if dep_type == 'pkgconfig'
> +     gio_command += ['--pkg=gio-unix-2.0']
> +-    giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
> ++    giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
> +     # Get the installed gio-unix header list
> +     ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
> +     if ret.returncode() != 0
> +@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
> + )
> +
> + typelibs = []
> ++if get_option('enable-gi-cross-wrapper') != ''
> ++    gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@',
> ++              '--includedir', meson.current_build_dir(),
> ++              '--includedir', meson.current_source_dir(),
> ++    ]
> ++else
> ++    gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
> ++              '--includedir', meson.current_build_dir(),
> ++              '--includedir', meson.current_source_dir(),
> ++    ]
> ++endif
> ++
> + foreach gir : gir_files
> +   typelibs += custom_target('generate-typelib- at 0@'.format(gir).underscorify(),
> +     input: gir,
> +     output: '@BASENAME at .typelib',
> +     depends: [gobject_gir, ],
> +-    command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
> +-              '--includedir', meson.current_build_dir(),
> +-              '--includedir', meson.current_source_dir(),
> +-    ],
> ++    command: gircompiler_command,
> +     install: true,
> +     install_dir: typelibdir,
> +   )
> +diff --git a/meson.build b/meson.build
> +index 95bbd2b..f7baefd 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -163,7 +163,9 @@ endif
> + subdir('girepository')
> + subdir('tools')
> + subdir('giscanner')
> +-subdir('gir')
> ++if get_option('enable-introspection-data') == true
> ++    subdir('gir')
> ++endif
> + subdir('examples')
> + subdir('docs')
> + subdir('tests')
> +diff --git a/meson_options.txt b/meson_options.txt
> +index 445a68a..a325511 100644
> +--- a/meson_options.txt
> ++++ b/meson_options.txt
> +@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3',
> + option('gir_dir_prefix', type: 'string',
> +   description: 'Intermediate prefix for gir installation under ${prefix}'
> + )
> ++
> ++option('enable-host-gi', type: 'boolean', value : false,
> ++  description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)'
> ++)
> ++
> ++option('enable-gi-cross-wrapper', type: 'string',
> ++  description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)'
> ++)
> ++
> ++option('enable-gi-ldd-wrapper', type: 'string',
> ++  description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)'
> ++)
> ++
> ++option('enable-introspection-data', type: 'boolean', value : true,
> ++  description: 'Build introspection data (.gir and .typelib files) in addition to library and tools'
> ++)
> ++
> ++option('pkgconfig-sysroot-path', type: 'string',
> ++  description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)'
> ++)
> diff --git a/package/gobject-introspection/0003-disable-tests.patch b/package/gobject-introspection/0003-disable-tests.patch
> new file mode 100644
> index 0000000000..fcc5a794f3
> --- /dev/null
> +++ b/package/gobject-introspection/0003-disable-tests.patch
> @@ -0,0 +1,29 @@
> +From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <aduskett@gmail.com>
> +Date: Mon, 3 Feb 2020 10:07:15 -0800
> +Subject: [PATCH] disable tests
> +
> +If introspection data on the host is not built, meson throws the error:
> +"Unknown variable "typelibs". Because tests are not required, removing
> +the subdir tests alltogether fixes this issue.
> +
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> + meson.build | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/meson.build b/meson.build
> +index a5e825f..981e936 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -171,7 +171,6 @@ subdir('giscanner')
> + subdir('gir')
> + subdir('examples')
> + subdir('docs')
> +-subdir('tests')
> +
> + install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
> + install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
> +--
> +2.24.1
> +
> diff --git a/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch b/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
> new file mode 100644
> index 0000000000..cffc2d954d
> --- /dev/null
> +++ b/package/gobject-introspection/0004-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
> +@@ -120,6 +120,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")
> +@@ -417,6 +420,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/0005-giscanner-add-a-use-ldd-wrapper-option.patch b/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch
> new file mode 100644
> index 0000000000..386c1c34b0
> --- /dev/null
> +++ b/package/gobject-introspection/0005-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
> +@@ -123,6 +123,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
> +@@ -97,7 +97,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/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..06f5635610
> --- /dev/null
> +++ b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
> @@ -0,0 +1,73 @@
> +From 3a9b3d8179b7eb9d2cc93da31578945bc03a45c3 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Fri, 27 Apr 2018 12:56:15 -0400
> +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>
> +Signed-off-by: Adam Duskett <aduskett@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 d10327c..6cf25d5 100644
> +--- a/giscanner/ccompiler.py
> ++++ b/giscanner/ccompiler.py
> +@@ -174,7 +174,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.
> +
> +@@ -184,7 +184,7 @@ class CCompiler(object):
> +         if os.name == 'nt':
> +             runtime_path_envvar = ['LIB', 'PATH']
> +         else:
> +-            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
> ++            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_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 3c7220b..0abd565 100644
> +--- a/giscanner/dumper.py
> ++++ b/giscanner/dumper.py
> +@@ -244,7 +244,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 d262785..51c9570 100755
> +--- a/giscanner/scannermain.py
> ++++ b/giscanner/scannermain.py
> +@@ -126,6 +126,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.14.3
> +
> 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..08835d3ecc
> --- /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
> +@@ -229,6 +229,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-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch
> new file mode 100644
> index 0000000000..568758d332
> --- /dev/null
> +++ b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch
> @@ -0,0 +1,28 @@
> +From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Wed, 5 Sep 2018 16:46:52 +0200
> +Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
> +
> +prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
> +It is not an error per se, but it breaks subprocess.check_output().
> +
> +Upstream-Status: Inappropriate [oe-core specific]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
> +---
> + giscanner/shlibs.py | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
> +index d67df95..80352a6 100644
> +--- a/giscanner/shlibs.py
> ++++ b/giscanner/shlibs.py
> +@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries):
> +             args.extend(['otool', '-L', binary.args[0]])
> +         else:
> +             args.extend(['ldd', binary.args[0]])
> +-        output = subprocess.check_output(args)
> ++        output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
> +         if isinstance(output, bytes):
> +             output = output.decode("utf-8", "replace")
> +
> diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in
> new file mode 100644
> index 0000000000..ecb4f048f3
> --- /dev/null
> +++ b/package/gobject-introspection/Config.in
> @@ -0,0 +1,33 @@
> +config BR2_PACKAGE_GOBJECT_INTROSPECTION
> +	bool "gobject-introspection"
> +	# While gcc 4.8 might be compatible with gobject-introspection,
> +	# The autobuilders use some toolchains from codesourcery which
> +	# have gcc 4.8 and a very old version of glibc, which will cause
> +	# compile errors with locale.c. As such, require 4.9 until this
> +	# can be verified.
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
> +	depends on BR2_USE_MMU # python3, libglib2
> +	depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
> +	depends on BR2_TOOLCHAIN_USES_GLIBC
> +	select BR2_PACKAGE_HOST_PRELINK_CROSS
> +	select BR2_PACKAGE_HOST_QEMU
> +	select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
> +	select BR2_PACKAGE_LIBFFI
> +	select BR2_PACKAGE_LIBGLIB2
> +	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
> +	select BR2_PACKAGE_ZLIB
> +	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, gcc >= 4.9"
> +	depends on BR2_USE_MMU
> +	depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
> +	depends on !BR2_TOOLCHAIN_USES_GLIBC
> +	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
> diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in
> new file mode 100644
> index 0000000000..a88fde7aa9
> --- /dev/null
> +++ b/package/gobject-introspection/g-ir-compiler.in
> @@ -0,0 +1,3 @@
> +#!/usr/bin/env sh
> +
> +$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/bin/g-ir-compiler "$@"
> 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..3095414f69
> --- /dev/null
> +++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
> @@ -0,0 +1,2 @@
> +#!/usr/bin/env sh
> +${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/ "$@"
> 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..0b7a51d18b
> --- /dev/null
> +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
> @@ -0,0 +1,17 @@
> +#!/usr/bin/env sh
> +
> +# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel
> +# is older than the target kernel.
> +# 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
> +GIO_MODULE_DIR=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/lib/gio/modules-dummy \
> + at QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \
> +-L $(dirname $0)/../@GNU_TARGET_NAME@/sysroot/ \
> +-E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/lib:$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/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..9ce5b4b425
> --- /dev/null
> +++ b/package/gobject-introspection/g-ir-scanner.in
> @@ -0,0 +1,8 @@
> +#!/usr/bin/env sh
> +
> +export GI_SCANNER_DISABLE_CACHE=1
> +$HOST_DIR/bin/g-ir-scanner.real \
> +--lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \
> +--use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \
> +--use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \
> +--add-include-path=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/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..0454c59565
> --- /dev/null
> +++ b/package/gobject-introspection/gobject-introspection.hash
> @@ -0,0 +1,4 @@
> +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.sha256sum
> +sha256 b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2 gobject-introspection-1.62.0.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..003a1eb259
> --- /dev/null
> +++ b/package/gobject-introspection/gobject-introspection.mk
> @@ -0,0 +1,115 @@
> +################################################################################
> +#
> +# gobject-introspection
> +#
> +################################################################################
> +
> +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.62
> +GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
> +GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
> +GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
> +GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
> +GOBJECT_INTROSPECTION_AUTORECONF = YES
> +GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause
> +GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l
> +
> +GOBJECT_INTROSPECTION_DEPENDENCIES = \
> +	host-autoconf-archive \
> +	host-gobject-introspection \
> +	host-prelink-cross \
> +	host-qemu \
> +	libffi \
> +	libglib2 \
> +	python3 \
> +	zlib
> +
> +HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \
> +	host-bison \
> +	host-flex \
> +	host-libglib2 \
> +	host-python3
> +
> +# g-ir-scanner will default to /usr/bin/ld for linking if this is not set.
> +GOBJECT_INTROSPECTION_NINJA_ENV += \
> +	CC="$(TARGET_CC)"
> +
> +# Disable introspection data on the host, as it is not needed and
> +# the package will attempt to use the systems libglib2 which will fail
> +# if the systems libglib2 version is older than 2.60.
> +HOST_GOBJECT_INTROSPECTION_CONF_OPTS = \
> +	-Denable-introspection-data=false
> +
> +# Use the host gi-scanner to prevent the scanner from generating incorrect
> +# elf classes.
> +GOBJECT_INTROSPECTION_CONF_OPTS = \
> +	-Denable-host-gi=true \
> +	-Denable-gi-cross-wrapper="$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \
> +	-Denable-gi-ldd-wrapper="$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
> +	-Denable-introspection-data=true
> +
> +ifeq ($(BR2_PACKAGE_CAIRO),y)
> +GOBJECT_INTROSPECTION_DEPENDENCIES += cairo
> +GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=true
> +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
> +
> +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \
> +	GI_SCANNER_DISABLE_CACHE=1
> +
> +# Make sure g-ir-tool-template uses the host python.
> +define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
> +	$(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
> +endef
> +GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
> +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
> +
> +# These wrappers allow gobject-introspection to build the internal introspection
> +# libraries during the build process.
> +define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
> +	mv $(HOST_DIR)/usr/bin/g-ir-scanner $(HOST_DIR)/usr/bin/g-ir-scanner.real
> +
> +	$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \
> +		$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper
> +	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
> +		$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper
> +
> +	$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \
> +		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
> +	$(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \
> +		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
> +	$(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \
> +		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
> +	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
> +		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
> +
> +	$(INSTALL) -D -m 755 \
> +		$(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-compiler.in $(HOST_DIR)/usr/bin/g-ir-compiler
> +	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
> +		$(HOST_DIR)/usr/bin/g-ir-compiler
> +
> +	$(INSTALL) -D -m 755 \
> +		$(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner.in $(HOST_DIR)/usr/bin/g-ir-scanner
> +	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
> +		$(HOST_DIR)/usr/bin/g-ir-scanner
> +
> +endef
> +HOST_GOBJECT_INTROSPECTION_POST_INSTALL_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
> +
> +define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
> +	# 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
> +	mkdir -p $(STAGING_DIR)/usr/lib/gio/modules-dummy
> +endef
> +GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
> +
> +# Only .typelib files are needed to run.
> +define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
> +	find $(TARGET_DIR)/usr/share \( -iname "*.gir" -o -iname \*.rnc \) -delete
> +endef
> +GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
> +
> +$(eval $(meson-package))
> +$(eval $(host-meson-package))
> 

-- 
Giulio Benetti
Benetti Engineering sas

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v16 4/4] package/gobject-introspection: new package
  2020-02-07 21:45   ` Giulio Benetti
@ 2020-02-08 19:14     ` Giulio Benetti
  0 siblings, 0 replies; 11+ messages in thread
From: Giulio Benetti @ 2020-02-08 19:14 UTC (permalink / raw)
  To: buildroot

Hi Adam,

On 2/7/20 10:45 PM, Giulio Benetti wrote:
> Hi Adam, All,
> 
> On 2/7/20 3:38 AM, aduskett at gmail.com wrote:
>> From: Adam Duskett <Aduskett@gmail.com>
>>
>> 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.
>>
>> There's an XML format called GIR used by GObject-Introspection.
>> The purpose of it is to provide a standard structure to access the complete
>> available API that a library or other unit of code exports. It's
>> language-agnostic using namespaces to separate core, language, or
>> library-specific functionality.
>>
>> Cross-compiling gobject-introspection is not an easy task. The main issue is
>> that in the process of creating the XML files, gobject-introspection must first
>> run and scan the binary, which, if the binary is cross-compiled, would not
>> typically be possible from the host system.
>>
>> Because of this limitation, we use several wrappers to call instead first out
>> qemu, which runs the native scanner to create the binaries.
>>
>> There are seven total patches and four different wrapper files needed to
>> successfully cross-compile and run this package, many of them are from
>> open-embedded, but one of them is of my own doing.
>>
>> 1) Revert a previous, incomplete attempt at adding cross-compiling support.
>>
>> 2) Add support for cross-compiling with meson.
>>
>> 3) Disable tests.
>>
>> 4) Add an option to use a binary wrapper; this patch will force giscanner to
>>      use a wrapper executable to run binaries it's producing, instead of
>>      attempting to run them from the host.
>>
>> 5) Add an option to use an LDD wrapper, again, useful for cross-compiled
>>      environments.
>>
>> 6) Add a --lib-dirs-envar option to pass to giscanner. (See patch for details.)
>>
>> 7) Add rpath-links to ccompiler: when passing the PACKAGE_GIR_EXTRA_LIBS_PATH
>>      to the ccompiler.py script, ccompiler.py needs to add -Wl,-rpath-link to the
>>      environment for the package to correctly link against the passed on paths.
>>
>> 8) Ignore error return codes from ldd-wrapper because prelink-rtld returns 127
>>      when it can't find a library, which breaks subprocess.check_output().
>>
>> Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> 
> Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> 
>> ---
>> Changes v15 -> v16:
>>     - Re-added missing Config.in entry.
>>     - Removed a set -x in g-ir-scanner-wrapper
>>     - Fixed paths in g-ir-compiler.in
>>     - Removed GOBJECT_INTROSPECTION_PC_FILE_FIXUP in gobject-introspection.mk
>>       because the toolsdir entry no longer exists in the .pc file.
>>     - Cleaned up the grammar in the commit message.
>>
>> Changes v14 -> v15:
>>     - Fixed number of patches in commit message. (Arnout)
>>     - Fixed license information (Adam)
>>     - Sorted dependencies (Arnout)
>>     - Removed redundant comment (Arnout)
>>     - Reordered host and target macros (Arnout)
>>     - Moved wrappers and wrapper installation logic to the host dir. (Arnout)
>>     - Combined the find functions in the target_finalize_hooks. (Arnout)
>>     
>>
>> Changes v13 -> v14:
>>     - Bump to version 1.62.0
>>
>> Changes v10 -> v11:
>>     - reorder config.in entries: arch deps first, then toolchain deps
>>       and order packages deps alphabetically (Yann)
>>     - drop dependency on threads, wchar, and !static: it's implicit from
>>       glibc (Yann)
>>     - Bump to version 1.60.2
>>     - Switched to a meson build system as autotools is no longer supported with
>>       gobject-introspection 1.60.x.
>>     - Removed the following patches that are no longer needed:
>>         - 0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
>>         - 0005-user-PYTHON_CONFIG-to-find-includes.patch
>>         - 0008-fix-gobject-pc.file.patch
>>     - Add the following patches:
>>         - 0002-add-cross-compilation-support-to-meson.patch
>>         - 0003-meson.build-disable-tests-when-cross-compiling.patch
>>         - 0008-ignore-error-return-codes-from-ldd-wrapper.patch
>>
>> Changes v9 -> v10:
>>     - Makefile cleanup
>>     - Fix license syntax (Thomas)
>>     - Add libffi as a mandatory dependency (Thomas)
>>     - remove --disalbe-static (Thomas)
>>     - add --with-cairo if the cairo package is selected (Thomas)
>>     - Change PYTHON_INCLUDES to PYTHON_CONFIG in gobject-introspection.mk
>>       (Thomas)
>>     - Use | for all sed functions (Thomas)
>>     - Remove GOBJECT_INTROSPECTION_WRAPPERS (Thomas)
>>     - Add GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES target finalize
>>       hook. (Thomas)
>>     - Use $(dirname $0) in wrappers instead of $STAGING_DIR (Thomas)
>>     - Remove _GIR_EXTRA_LIBS_PATH in pkg-autotools.mk in favor of a
>>       seperate patch. (Thomas)
>>
>> Changes v8 -> v9:
>>     - Create the $(STAGING_DIR)/usr/lib/gio/modules-dummy directory in the
>>       GOBJECT_INTROSPECTION_POST_PATCH_HOOKS to prevent qemu from
>>       segfaulting when g-ir-scanner-qemuwrapper is ran.
>>     - Remove the $(STAGING_DIR) prefix from gobject-introspection-1.0.pc
>>       to prevent pkg-config from appending a second staging_dir to the path
>>       of the g-ir-compiler. This prevents packages such a gstreamer1 from
>>       trying to call $(STAGING_DIR)/$(STAGING_DIR)/usr/bin/g-ir-compiler,
>>       which will break the build.
>>
>> Changes v7 -> v8:
>>     - Add "select BR2_PACKAGE_HOST_PRELINK_CROSS" to Config.in
>>
>> Changes v6 -> v7:
>>     - Remove the cross-ldd script in favor of the prelink-cross package.
>>     - Install the ldd and qemu wrappers in a post patch hook seperate of
>>       the other wrappers.
>>     - Set --enable-introspection-data in the configure options.
>>
>> Changes v5 -> v6:
>>     - Update gobject-introspection to 1.56.1
>>     - Remove upstreamed 0008-add-Float128.patch
>>
>> Changes v4 -> v5:
>>     - Added a more detailed commit message (Yann)
>>     - Removed  $HOST_DIR/bin/qemu- at HOST_QEMU_ARCH@ @HOST_QEMU_CPU_TUNE@
>>       in favor of @QEMU_USER@ (Thanks Yann)
>>
>> 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
>>
>> 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 or runtime, only compile time.
>>
>> Changes v1 -> v2:
>>     - Fixed wrappers
>>     - Added 0007-giscanner-add-a-lib-dirs-envvar-option.patch
>>     - Added 0008-add-Float128.patch
>>
>>    DEVELOPERS                                    |   1 +
>>    package/Config.in                             |   1 +
>>    ...lete-upstream-attempt-at-cross-compi.patch |  33 ++++
>>    ...d-cross-compilation-support-to-meson.patch | 163 ++++++++++++++++++
>>    .../0003-disable-tests.patch                  |  29 ++++
>>    ...canner-add-use-binary-wrapper-option.patch |  52 ++++++
>>    ...scanner-add-a-use-ldd-wrapper-option.patch |  48 ++++++
>>    ...scanner-add-a-lib-dirs-envvar-option.patch |  73 ++++++++
>>    .../0007-Add-rpath-links-to-ccompiler.patch   |  29 ++++
>>    ...-error-return-codes-from-ldd-wrapper.patch |  28 +++
>>    package/gobject-introspection/Config.in       |  33 ++++
>>    .../gobject-introspection/g-ir-compiler.in    |   3 +
>>    .../g-ir-scanner-lddwrapper.in                |   2 +
>>    .../g-ir-scanner-qemuwrapper.in               |  17 ++
>>    package/gobject-introspection/g-ir-scanner.in |   8 +
>>    .../gobject-introspection.hash                |   4 +
>>    .../gobject-introspection.mk                  | 116 +++++++++++++
>>    17 files changed, 640 insertions(+)
>>    create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
>>    create mode 100644 package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
>>    create mode 100644 package/gobject-introspection/0003-disable-tests.patch
>>    create mode 100644 package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
>>    create mode 100644 package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.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-ignore-error-return-codes-from-ldd-wrapper.patch
>>    create mode 100644 package/gobject-introspection/Config.in
>>    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 7db172d45f..e17fece9a6 100644
>> --- a/DEVELOPERS
>> +++ b/DEVELOPERS
>> @@ -31,6 +31,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/package/Config.in b/package/Config.in
>> index bad4f9cba6..0132bc763a 100644
>> --- a/package/Config.in
>> +++ b/package/Config.in
>> @@ -1774,6 +1774,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..1e8bd3518a
>> --- /dev/null
>> +++ b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
>> @@ -0,0 +1,33 @@
>> +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/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
>> +index 1134f33..9bdc2bc 100644
>> +--- a/giscanner/gdumpparser.py
>> ++++ b/giscanner/gdumpparser.py
>> +@@ -156,12 +156,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-add-cross-compilation-support-to-meson.patch b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
>> new file mode 100644
>> index 0000000000..5e3ac59dd9
>> --- /dev/null
>> +++ b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
>> @@ -0,0 +1,163 @@
>> +From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
>> +From: Alexander Kanavin <alex.kanavin@gmail.com>
>> +Date: Thu, 15 Nov 2018 15:10:05 +0100
>> +Subject: [PATCH] add cross-compilation support to meson
>> +
>> +Upstream-Status: Pending
>> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
>> +---
>> + gir/meson.build   | 62 ++++++++++++++++++++++++++++++++++-------------
>> + meson.build       |  4 ++-
>> + meson_options.txt | 20 +++++++++++++++
>> + 3 files changed, 68 insertions(+), 18 deletions(-)
>> +
>> +diff --git a/gir/meson.build b/gir/meson.build
>> +index 85ae575..327c134 100644
>> +--- a/gir/meson.build
>> ++++ b/gir/meson.build
>> +@@ -36,16 +36,29 @@ gir_files = [
>> + typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
>> + install_data(gir_files, install_dir: girdir)
>> +
>> +-scanner_command = [
>> +-  python,
>> +-  girscanner,
>> +-  '--output=@OUTPUT@',
>> +-  '--no-libtool',
>> +-  '--quiet',
>> +-  '--reparse-validate',
>> +-  '--add-include-path', join_paths(meson.current_build_dir()),
>> +-  '--add-include-path', join_paths(meson.current_source_dir()),
>> +-]
>> ++if get_option('enable-host-gi')
>> ++    scanner_command = [
>> ++      'g-ir-scanner',
>> ++      '--output=@OUTPUT@',
>> ++      '--no-libtool',
>> ++      '--quiet',
>> ++      '--reparse-validate',
>> ++      '--add-include-path', join_paths(meson.current_build_dir()),
>> ++      '--add-include-path', join_paths(meson.current_source_dir()),
>> ++    ]
>> ++else
>> ++    scanner_command = [
>> ++      python,
>> ++      girscanner,
>> ++      '--output=@OUTPUT@',
>> ++      '--no-libtool',
>> ++      '--quiet',
>> ++      '--reparse-validate',
>> ++      '--add-include-path', join_paths(meson.current_build_dir()),
>> ++      '--add-include-path', join_paths(meson.current_source_dir()),
>> ++    ]
>> ++endif
>> ++
>> +
>> + dep_type = glib_dep.type_name()
>> + if dep_type == 'internal'
>> +@@ -58,6 +71,12 @@ if dep_type == 'internal'
>> +                       '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
>> + endif
>> +
>> ++if get_option('enable-gi-cross-wrapper') != ''
>> ++  scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')]
>> ++endif
>> ++if get_option('enable-gi-ldd-wrapper') != ''
>> ++  scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')]
>> ++endif
>> + # Take a glob and print to newlines
>> + globber = '''
>> + from glob import glob
>> +@@ -84,8 +103,8 @@ glib_command = scanner_command + [
>> +
>> + if dep_type == 'pkgconfig'
>> +   glib_command += ['--external-library', '--pkg=glib-2.0']
>> +-  glib_libdir = glib_dep.get_pkgconfig_variable('libdir')
>> +-  glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
>> ++  glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir')
>> ++  glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
>> +   glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
>> +   glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
>> +   glib_files += join_paths(glib_libincdir, 'glibconfig.h')
>> +@@ -339,7 +358,7 @@ endforeach
>> + if giounix_dep.found()
>> +   if dep_type == 'pkgconfig'
>> +     gio_command += ['--pkg=gio-unix-2.0']
>> +-    giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
>> ++    giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
>> +     # Get the installed gio-unix header list
>> +     ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
>> +     if ret.returncode() != 0
>> +@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
>> + )
>> +
>> + typelibs = []
>> ++if get_option('enable-gi-cross-wrapper') != ''
>> ++    gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@',
>> ++              '--includedir', meson.current_build_dir(),
>> ++              '--includedir', meson.current_source_dir(),
>> ++    ]
>> ++else
>> ++    gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
>> ++              '--includedir', meson.current_build_dir(),
>> ++              '--includedir', meson.current_source_dir(),
>> ++    ]
>> ++endif
>> ++
>> + foreach gir : gir_files
>> +   typelibs += custom_target('generate-typelib- at 0@'.format(gir).underscorify(),
>> +     input: gir,
>> +     output: '@BASENAME at .typelib',
>> +     depends: [gobject_gir, ],
>> +-    command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
>> +-              '--includedir', meson.current_build_dir(),
>> +-              '--includedir', meson.current_source_dir(),
>> +-    ],
>> ++    command: gircompiler_command,
>> +     install: true,
>> +     install_dir: typelibdir,
>> +   )
>> +diff --git a/meson.build b/meson.build
>> +index 95bbd2b..f7baefd 100644
>> +--- a/meson.build
>> ++++ b/meson.build
>> +@@ -163,7 +163,9 @@ endif
>> + subdir('girepository')
>> + subdir('tools')
>> + subdir('giscanner')
>> +-subdir('gir')
>> ++if get_option('enable-introspection-data') == true
>> ++    subdir('gir')
>> ++endif
>> + subdir('examples')
>> + subdir('docs')
>> + subdir('tests')
>> +diff --git a/meson_options.txt b/meson_options.txt
>> +index 445a68a..a325511 100644
>> +--- a/meson_options.txt
>> ++++ b/meson_options.txt
>> +@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3',
>> + option('gir_dir_prefix', type: 'string',
>> +   description: 'Intermediate prefix for gir installation under ${prefix}'
>> + )
>> ++
>> ++option('enable-host-gi', type: 'boolean', value : false,
>> ++  description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)'
>> ++)
>> ++
>> ++option('enable-gi-cross-wrapper', type: 'string',
>> ++  description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)'
>> ++)
>> ++
>> ++option('enable-gi-ldd-wrapper', type: 'string',
>> ++  description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)'
>> ++)
>> ++
>> ++option('enable-introspection-data', type: 'boolean', value : true,
>> ++  description: 'Build introspection data (.gir and .typelib files) in addition to library and tools'
>> ++)
>> ++
>> ++option('pkgconfig-sysroot-path', type: 'string',
>> ++  description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)'
>> ++)
>> diff --git a/package/gobject-introspection/0003-disable-tests.patch b/package/gobject-introspection/0003-disable-tests.patch
>> new file mode 100644
>> index 0000000000..fcc5a794f3
>> --- /dev/null
>> +++ b/package/gobject-introspection/0003-disable-tests.patch
>> @@ -0,0 +1,29 @@
>> +From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001
>> +From: Adam Duskett <aduskett@gmail.com>
>> +Date: Mon, 3 Feb 2020 10:07:15 -0800
>> +Subject: [PATCH] disable tests
>> +
>> +If introspection data on the host is not built, meson throws the error:
>> +"Unknown variable "typelibs". Because tests are not required, removing
>> +the subdir tests alltogether fixes this issue.
>> +
>> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
>> +---
>> + meson.build | 1 -
>> + 1 file changed, 1 deletion(-)
>> +
>> +diff --git a/meson.build b/meson.build
>> +index a5e825f..981e936 100644
>> +--- a/meson.build
>> ++++ b/meson.build
>> +@@ -171,7 +171,6 @@ subdir('giscanner')
>> + subdir('gir')
>> + subdir('examples')
>> + subdir('docs')
>> +-subdir('tests')
>> +
>> + install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
>> + install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
>> +--
>> +2.24.1
>> +
>> diff --git a/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch b/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
>> new file mode 100644
>> index 0000000000..cffc2d954d
>> --- /dev/null
>> +++ b/package/gobject-introspection/0004-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
>> +@@ -120,6 +120,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")
>> +@@ -417,6 +420,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/0005-giscanner-add-a-use-ldd-wrapper-option.patch b/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch
>> new file mode 100644
>> index 0000000000..386c1c34b0
>> --- /dev/null
>> +++ b/package/gobject-introspection/0005-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
>> +@@ -123,6 +123,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
>> +@@ -97,7 +97,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/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..06f5635610
>> --- /dev/null
>> +++ b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
>> @@ -0,0 +1,73 @@
>> +From 3a9b3d8179b7eb9d2cc93da31578945bc03a45c3 Mon Sep 17 00:00:00 2001
>> +From: Alexander Kanavin <alex.kanavin@gmail.com>
>> +Date: Fri, 27 Apr 2018 12:56:15 -0400
>> +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>
>> +Signed-off-by: Adam Duskett <aduskett@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 d10327c..6cf25d5 100644
>> +--- a/giscanner/ccompiler.py
>> ++++ b/giscanner/ccompiler.py
>> +@@ -174,7 +174,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.
>> +
>> +@@ -184,7 +184,7 @@ class CCompiler(object):
>> +         if os.name == 'nt':
>> +             runtime_path_envvar = ['LIB', 'PATH']
>> +         else:
>> +-            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
>> ++            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_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 3c7220b..0abd565 100644
>> +--- a/giscanner/dumper.py
>> ++++ b/giscanner/dumper.py
>> +@@ -244,7 +244,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 d262785..51c9570 100755
>> +--- a/giscanner/scannermain.py
>> ++++ b/giscanner/scannermain.py
>> +@@ -126,6 +126,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.14.3
>> +
>> 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..08835d3ecc
>> --- /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
>> +@@ -229,6 +229,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-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch
>> new file mode 100644
>> index 0000000000..568758d332
>> --- /dev/null
>> +++ b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch
>> @@ -0,0 +1,28 @@
>> +From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
>> +From: Alexander Kanavin <alex.kanavin@gmail.com>
>> +Date: Wed, 5 Sep 2018 16:46:52 +0200
>> +Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
>> +
>> +prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
>> +It is not an error per se, but it breaks subprocess.check_output().
>> +
>> +Upstream-Status: Inappropriate [oe-core specific]
>> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> +Signed-off-by: Adam Duskett <aduskett@gmail.com>
>> +---
>> + giscanner/shlibs.py | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
>> +index d67df95..80352a6 100644
>> +--- a/giscanner/shlibs.py
>> ++++ b/giscanner/shlibs.py
>> +@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries):
>> +             args.extend(['otool', '-L', binary.args[0]])
>> +         else:
>> +             args.extend(['ldd', binary.args[0]])
>> +-        output = subprocess.check_output(args)
>> ++        output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
>> +         if isinstance(output, bytes):
>> +             output = output.decode("utf-8", "replace")
>> +
>> diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in
>> new file mode 100644
>> index 0000000000..ecb4f048f3
>> --- /dev/null
>> +++ b/package/gobject-introspection/Config.in
>> @@ -0,0 +1,33 @@
>> +config BR2_PACKAGE_GOBJECT_INTROSPECTION
>> +	bool "gobject-introspection"
>> +	# While gcc 4.8 might be compatible with gobject-introspection,
>> +	# The autobuilders use some toolchains from codesourcery which
>> +	# have gcc 4.8 and a very old version of glibc, which will cause
>> +	# compile errors with locale.c. As such, require 4.9 until this
>> +	# can be verified.
>> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
>> +	depends on BR2_USE_MMU # python3, libglib2
>> +	depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
>> +	depends on BR2_TOOLCHAIN_USES_GLIBC
>> +	select BR2_PACKAGE_HOST_PRELINK_CROSS
>> +	select BR2_PACKAGE_HOST_QEMU
>> +	select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
>> +	select BR2_PACKAGE_LIBFFI
>> +	select BR2_PACKAGE_LIBGLIB2
>> +	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
>> +	select BR2_PACKAGE_ZLIB
>> +	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, gcc >= 4.9"
>> +	depends on BR2_USE_MMU
>> +	depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
>> +	depends on !BR2_TOOLCHAIN_USES_GLIBC
>> +	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9

this is a remind:
as we noticed in IRC with Yann, here you need:

+	depends on !BR2_TOOLCHAIN_USES_GLIBC || \
+		   !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9

Best regards
-- 
Giulio Benetti
Benetti Engineering sas

>> diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in
>> new file mode 100644
>> index 0000000000..a88fde7aa9
>> --- /dev/null
>> +++ b/package/gobject-introspection/g-ir-compiler.in
>> @@ -0,0 +1,3 @@
>> +#!/usr/bin/env sh
>> +
>> +$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/bin/g-ir-compiler "$@"
>> 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..3095414f69
>> --- /dev/null
>> +++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
>> @@ -0,0 +1,2 @@
>> +#!/usr/bin/env sh
>> +${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/ "$@"
>> 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..0b7a51d18b
>> --- /dev/null
>> +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
>> @@ -0,0 +1,17 @@
>> +#!/usr/bin/env sh
>> +
>> +# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel
>> +# is older than the target kernel.
>> +# 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
>> +GIO_MODULE_DIR=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/lib/gio/modules-dummy \
>> + at QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \
>> +-L $(dirname $0)/../@GNU_TARGET_NAME@/sysroot/ \
>> +-E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/lib:$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/usr/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..9ce5b4b425
>> --- /dev/null
>> +++ b/package/gobject-introspection/g-ir-scanner.in
>> @@ -0,0 +1,8 @@
>> +#!/usr/bin/env sh
>> +
>> +export GI_SCANNER_DISABLE_CACHE=1
>> +$HOST_DIR/bin/g-ir-scanner.real \
>> +--lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \
>> +--use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \
>> +--use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \
>> +--add-include-path=$(dirname $0)/../@GNU_TARGET_NAME@/sysroot/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..0454c59565
>> --- /dev/null
>> +++ b/package/gobject-introspection/gobject-introspection.hash
>> @@ -0,0 +1,4 @@
>> +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.sha256sum
>> +sha256 b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2 gobject-introspection-1.62.0.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..003a1eb259
>> --- /dev/null
>> +++ b/package/gobject-introspection/gobject-introspection.mk
>> @@ -0,0 +1,115 @@
>> +################################################################################
>> +#
>> +# gobject-introspection
>> +#
>> +################################################################################
>> +
>> +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.62
>> +GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
>> +GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
>> +GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
>> +GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
>> +GOBJECT_INTROSPECTION_AUTORECONF = YES
>> +GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause
>> +GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l
>> +
>> +GOBJECT_INTROSPECTION_DEPENDENCIES = \
>> +	host-autoconf-archive \
>> +	host-gobject-introspection \
>> +	host-prelink-cross \
>> +	host-qemu \
>> +	libffi \
>> +	libglib2 \
>> +	python3 \
>> +	zlib
>> +
>> +HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \
>> +	host-bison \
>> +	host-flex \
>> +	host-libglib2 \
>> +	host-python3
>> +
>> +# g-ir-scanner will default to /usr/bin/ld for linking if this is not set.
>> +GOBJECT_INTROSPECTION_NINJA_ENV += \
>> +	CC="$(TARGET_CC)"
>> +
>> +# Disable introspection data on the host, as it is not needed and
>> +# the package will attempt to use the systems libglib2 which will fail
>> +# if the systems libglib2 version is older than 2.60.
>> +HOST_GOBJECT_INTROSPECTION_CONF_OPTS = \
>> +	-Denable-introspection-data=false
>> +
>> +# Use the host gi-scanner to prevent the scanner from generating incorrect
>> +# elf classes.
>> +GOBJECT_INTROSPECTION_CONF_OPTS = \
>> +	-Denable-host-gi=true \
>> +	-Denable-gi-cross-wrapper="$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \
>> +	-Denable-gi-ldd-wrapper="$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
>> +	-Denable-introspection-data=true
>> +
>> +ifeq ($(BR2_PACKAGE_CAIRO),y)
>> +GOBJECT_INTROSPECTION_DEPENDENCIES += cairo
>> +GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=true
>> +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
>> +
>> +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \
>> +	GI_SCANNER_DISABLE_CACHE=1
>> +
>> +# Make sure g-ir-tool-template uses the host python.
>> +define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
>> +	$(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
>> +endef
>> +GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
>> +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
>> +
>> +# These wrappers allow gobject-introspection to build the internal introspection
>> +# libraries during the build process.
>> +define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
>> +	mv $(HOST_DIR)/usr/bin/g-ir-scanner $(HOST_DIR)/usr/bin/g-ir-scanner.real
>> +
>> +	$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \
>> +		$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper
>> +	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
>> +		$(HOST_DIR)/usr/bin/g-ir-scanner-lddwrapper
>> +
>> +	$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \
>> +		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
>> +	$(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \
>> +		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
>> +	$(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \
>> +		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
>> +	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
>> +		$(HOST_DIR)/usr/bin/g-ir-scanner-qemuwrapper
>> +
>> +	$(INSTALL) -D -m 755 \
>> +		$(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-compiler.in $(HOST_DIR)/usr/bin/g-ir-compiler
>> +	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
>> +		$(HOST_DIR)/usr/bin/g-ir-compiler
>> +
>> +	$(INSTALL) -D -m 755 \
>> +		$(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner.in $(HOST_DIR)/usr/bin/g-ir-scanner
>> +	$(SED) "s%@GNU_TARGET_NAME@%$(GNU_TARGET_NAME)%g" \
>> +		$(HOST_DIR)/usr/bin/g-ir-scanner
>> +
>> +endef
>> +HOST_GOBJECT_INTROSPECTION_POST_INSTALL_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
>> +
>> +define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
>> +	# 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
>> +	mkdir -p $(STAGING_DIR)/usr/lib/gio/modules-dummy
>> +endef
>> +GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
>> +
>> +# Only .typelib files are needed to run.
>> +define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
>> +	find $(TARGET_DIR)/usr/share \( -iname "*.gir" -o -iname \*.rnc \) -delete
>> +endef
>> +GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
>> +
>> +$(eval $(meson-package))
>> +$(eval $(host-meson-package))
>>
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-02-08 19:14 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-07  2:38 [Buildroot] [PATCH v16 0/4] package/gobject-introspection: new package aduskett at gmail.com
2020-02-07  2:38 ` [Buildroot] [PATCH v16 1/4] package/libiberty: " aduskett at gmail.com
2020-02-07 21:44   ` Giulio Benetti
2020-02-07  2:38 ` [Buildroot] [PATCH v16 2/4] package/gdb: depend on libiberty aduskett at gmail.com
2020-02-07 21:45   ` Giulio Benetti
2020-02-07  2:38 ` [Buildroot] [PATCH v16 3/4] package/prelink-cross: new package aduskett at gmail.com
2020-02-07 21:45   ` Giulio Benetti
2020-02-07  2:38 ` [Buildroot] [PATCH v16 4/4] package/gobject-introspection: " aduskett at gmail.com
2020-02-07 21:45   ` Giulio Benetti
2020-02-08 19:14     ` Giulio Benetti
2020-02-07 21:34 ` [Buildroot] [PATCH v16 0/4] " Giulio Benetti

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.