Gobject-introspection: New package
v7 cover Gobject-introspection: New package
I am releasing version 7 of the gobject-introspection patch series. I received reports of some packages requiring installed .typelib files on the target filing system from the gobject-introspection package. Previous versions of this patch had the configure flag
of --disable-introspection-data set. This patch now sets this flag to enabled, which builds the .typelib files.
This change requires a few changes, however:
First: I wasn't able to get the cross-ldd script to work correctly. What was happening was that cross-ldd was calling out my host-ldd, which then would cause the .typelib files to fail the linking step. Adding the prelink-cross package fixes this issue. As such, I removed the cross-ldd wrapper from package/gobject-introspection.
Second: I had to move some logic around first to install the ldd and qemu wrappers first, as gobject-introspection calls g-ir-ldd-wrapper and g-ir-scanner-qemuwrapper during the compiling process.
Adam Duskett (5):
binutils: install libiberty for host build.
prelink-cross: new package
gstreamer1 packages: explicitly disable introspection
gobject-introspection: new package gstreamer1 packages: add support for introspection
DEVELOPERS | 1 + Makefile | 2 + package/Config.in | 1 + package/Config.in.host | 1 + package/binutils/binutils.mk | 1 + ...lete-upstream-attempt-at-cross-compi.patch | 50 +++++ ...-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 203 ++++++++++++++++++ ...canner-add-use-binary-wrapper-option.patch | 52 +++++ ...scanner-add-a-use-ldd-wrapper-option.patch | 48 +++++ .../0005-add-PYTHON_INCLUDES-override.patch | 39 ++++ ...scanner-add-a-lib-dirs-envvar-option.patch | 73 +++++++ .../0007-Add-rpath-links-to-ccompiler.patch | 29 +++ package/gobject-introspection/Config.in | 30 +++ .../gobject-introspection/g-ir-compiler.in | 2 + .../g-ir-scanner-lddwrapper.in | 2 + .../g-ir-scanner-qemuwrapper.in | 10 + package/gobject-introspection/g-ir-scanner.in | 3 + .../gobject-introspection.hash | 4 + .../gobject-introspection.mk | 98 +++++++++ .../gst1-plugins-bad/gst1-plugins-bad.mk | 8 +- ...ect-reference-to-gstreamer-sdp-in-Ma.patch | 26 +++ .../gst1-plugins-base/gst1-plugins-base.mk | 8 +- package/gstreamer1/gstreamer1/gstreamer1.mk | 7 + package/pkg-autotools.mk | 3 + package/prelink-cross/Config.in.host | 6 + package/prelink-cross/prelink-cross.hash | 3 + package/prelink-cross/prelink-cross.mk | 15 ++ 27 files changed, 723 insertions(+), 2 deletions(-) create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch create mode 100644 package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch create mode 100644 package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch create mode 100644 package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch create mode 100644 package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch create mode 100644 package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch create mode 100644 package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch create mode 100644 package/gobject-introspection/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/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch create mode 100644 package/prelink-cross/Config.in.host create mode 100644 package/prelink-cross/prelink-cross.hash create mode 100644 package/prelink-cross/prelink-cross.mk
Signature · 1 line
2.17.1
PATCH v7 1/5 binutils: install libiberty for host build.
Add --enable-install-libiberty to HOST_BINUTILS_CONF_OPTS to allow prelink-cross to build properly.
---
Changes v1 -> v7:
- Add patch to series.
package/binutils/binutils.mk | 1 + 1 file changed, 1 insertion(+)
package/binutils/binutils.mk +1 -0
@@ -84,6 +84,7 @@ HOST_BINUTILS_CONF_OPTS = \ --target=$(GNU_TARGET_NAME) \ --disable-shared \ --enable-static \ + --enable-install-libiberty \ --with-sysroot=$(STAGING_DIR) \ --enable-poison-system-directories \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
Signature · 1 line
2.17.1
PATCH v7 2/5 prelink-cross: new package
In reply to Adam DuskettPrelink-cross emulates a runtime linker for a given sysroot. This is necessary to allow gobject-introspection to build it's typelib files during cross-compiling.
---
Changes v1 -> v7:
- Add patch to series.
package/Config.in.host | 1 + package/prelink-cross/Config.in.host | 6 ++++++ package/prelink-cross/prelink-cross.hash | 3 +++ package/prelink-cross/prelink-cross.mk | 15 +++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/prelink-cross/Config.in.host create mode 100644 package/prelink-cross/prelink-cross.hash create mode 100644 package/prelink-cross/prelink-cross.mk
package/Config.in.host +1 -0
@@ -41,6 +41,7 @@ menu "Host utilities" source "package/parted/Config.in.host" source "package/patchelf/Config.in.host" source "package/pkgconf/Config.in.host" + source "package/prelink-cross/Config.in.host" source "package/pru-software-support/Config.in.host" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host"
package/prelink-cross/Config.in.host new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_PRELINK_CROSS + bool "host prelink-cross" + help + Emulate a runtime linker for a given sysroot. + + https://wiki.yoctoproject.org/wiki/Cross-Prelink
package/prelink-cross/prelink-cross.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally computed +sha256 7f2f864f330d4e44abba252d36e2795e6639e46b0ca927aa477cfd1419ca4995 prelink-cross-05aeafd053e56356ec8c62f4bb8f7b95bae192f3.tar.gz +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING
package/prelink-cross/prelink-cross.mk new file +15 -0
@@ -0,0 +1,15 @@ +################################################################################ +# +# host-prelink-cross +# +################################################################################ + +HOST_PRELINK_CROSS_VERSION = 05aeafd053e56356ec8c62f4bb8f7b95bae192f3 +HOST_PRELINK_CROSS_SITE = git://git.yoctoproject.org/prelink-cross +HOST_PRELINK_CROSS_SITE_METHOD = git +HOST_PRELINK_CROSS_LICENSE = GPL-2.0 +HOST_PRELINK_CROSS_LICENSE_FILES = COPYING +HOST_PRELINK_CROSS_AUTORECONF = YES +HOST_PRELINK_CROSS_DEPENDENCIES = host-binutils + +$(eval $(host-autotools-package))
Signature · 1 line
2.17.1
PATCH v7 3/5 gstreamer1 packages: explicitly disable introspection
In reply to Adam DuskettTo get GStreamer ready for introspection, we must first explicitly disable gstreamer1, plugins base and plugins bad from using introspection. If not, adding the gobject-introspection will result in these packages failing to build because setting the _GIR_EXTRA_LIBS_PATH variable is required.
The other gstreamer1 packages do not require setting the _GIR_EXTRA_LIBS_PATH variable.
---
Changes v1 -> v4:
- Add patch to series.
- Change TARGET_MAKE_ENV += GIR_EXTRA_LIBS_PATH to PACKAGE_GIR_EXTRA_LIBS_PATH.
Changes v4 -> v5:
- Change --enable-introspection=no to --disable-introspection (Yann)
Changes v5 -> v7:
- None
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 3 ++- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 3 ++- package/gstreamer1/gstreamer1/gstreamer1.mk | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +2 -1
@@ -21,7 +21,8 @@ GST1_PLUGINS_BAD_CONF_OPTS = \ --disable-winks \ --disable-android_media \ --disable-apple_media \ - --disable-acm + --disable-acm \ + --disable-introspection # Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +2 -1
@@ -14,7 +14,8 @@ GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ # gio_unix_2_0 is only used for tests GST1_PLUGINS_BASE_CONF_OPTS = \ --disable-examples \ - --disable-valgrind + --disable-valgrind \ + --disable-introspection # Options which require currently unpackaged libraries GST1_PLUGINS_BASE_CONF_OPTS += \
package/gstreamer1/gstreamer1/gstreamer1.mk +1 -0
@@ -17,6 +17,7 @@ GSTREAMER1_CONF_OPTS = \ --disable-failing-tests \ --disable-valgrind \ --disable-benchmarks \ + --disable-introspection \ $(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \ $(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \ $(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \
Signature · 1 line
2.17.1
PATCH v7 4/5 gobject-introspection: new package
In reply to Adam DuskettGObject 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 is meant to be 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, several wrappers are used to call instead first out qemu which will then run 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 two of them are of my own doing.
1) Revert a previous, incomplete attempt at adding cross-compiling support.
2) Add support for the various wrappers. (See patch for details.)
3) 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.
4) Add an option to use an LDD wrapper, again, useful for cross-compiled environments.
5) Overwrite python includes during the initial configure stage.
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.
---
Changes v1 -> v2:
- Fixed wrappers
- Added 0007-giscanner-add-a-lib-dirs-envvar-option.patch
- Added 0008-add-Float128.patch
Changes v2 -> v3:
- Removed Linux kernel dependency (baruch)
- Changed $(LINUX_VERSION) to $(BR2_TOOLCHAIN_HEADERS_AT_LEAST) (baruch)
- Changed @LINUX_VERSION@ in g-ir-scanner-qemuwrapper.in to @TOOLCHAIN_HEADERS_VERSION@ to match the above variable change.
- Added BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET in Config.in with only BR2_arm selected for now.
- Removed BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS in favor of the above change.
- Added two new lines in the base Makefile which removes any remaining .gir or .rnc files from the target filing system, as these are not needed for runtime, only compile time.
Changes v3 -> v4:
- Removed RFC tag.
- Added 0007-Add-rpath-links-to-ccompiler.patch
- Removed config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch as it is not Yocto specific.
- Added the _GIR_EXTRA_LIBS_PATH to pkg-autotools.mk. This allows package specific Gir libraries to be passed on to g-ir-scanner-qemuwrapper.
- Fixed a typo in g-ir-scanner-qemuwrapper.in.
- Remove BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET in favor of BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
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 v5 -> v6:
- Update gobject-introspection to 1.56.1
- Remove upstreamed 0008-add-Float128.patch
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.
DEVELOPERS | 1 + Makefile | 2 + package/Config.in | 1 + ...lete-upstream-attempt-at-cross-compi.patch | 50 +++++ ...-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 203 ++++++++++++++++++ ...canner-add-use-binary-wrapper-option.patch | 52 +++++ ...scanner-add-a-use-ldd-wrapper-option.patch | 48 +++++ .../0005-add-PYTHON_INCLUDES-override.patch | 39 ++++ ...scanner-add-a-lib-dirs-envvar-option.patch | 73 +++++++ .../0007-Add-rpath-links-to-ccompiler.patch | 29 +++ package/gobject-introspection/Config.in | 30 +++ .../gobject-introspection/g-ir-compiler.in | 2 + .../g-ir-scanner-lddwrapper.in | 2 + .../g-ir-scanner-qemuwrapper.in | 10 + package/gobject-introspection/g-ir-scanner.in | 3 + .../gobject-introspection.hash | 4 + .../gobject-introspection.mk | 98 +++++++++ package/pkg-autotools.mk | 3 + 18 files changed, 650 insertions(+) create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch create mode 100644 package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch create mode 100644 package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch create mode 100644 package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch create mode 100644 package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch create mode 100644 package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch create mode 100644 package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch create mode 100644 package/gobject-introspection/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
DEVELOPERS +1 -0
@@ -34,6 +34,7 @@ F: package/audit/ F: package/busybox/ F: package/checkpolicy/ F: package/cppdb/ +F: package/gobject-introspection/ F: package/gstreamer1/gstreamer1/ F: package/gstreamer1/gstreamer1-mm/ F: package/gstreamer1/gst1-plugins-bad/
Makefile +2 -0
@@ -699,6 +699,8 @@ target-finalize: $(PACKAGES) $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f + find $(TARGET_DIR)/usr/share/ -name '*.gir' -print0 | xargs -0 rm -f + find $(TARGET_DIR)/usr/share/ -name '*.rnc' -print0 | xargs -0 rm -f find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \ \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f ifneq ($(BR2_PACKAGE_GDB),y)
package/Config.in +1 -0
@@ -1536,6 +1536,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"
package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch new file +50 -0
50 lines not on this page · raw message
package/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch new file +203 -0
203 lines not on this page · raw message
package/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch new file +52 -0
52 lines not on this page · raw message
package/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch new file +48 -0
48 lines not on this page · raw message
package/gobject-introspection/0005-add-PYTHON_INCLUDES-override.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 08ee7e704d3ebbb783e26768074a5969d6843204 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Wed, 18 Oct 2017 17:31:19 -0400 +Subject: [PATCH] add PYTHON_INCLUDES override + +As the configure script mixes up host/target python. Equivalent to the +similar code in dbus-python. + +Signed-off-by: Adam Duskett <[email protected]> +--- + m4/python.m4 | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/m4/python.m4 b/m4/python.m4 +index ed5559d..9853263 100644 +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -43,7 +43,17 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], + [AC_REQUIRE([AM_PATH_PYTHON]) + AC_MSG_CHECKING(for headers required to compile python extensions) + dnl deduce PYTHON_INCLUDES +-PYTHON_INCLUDES=`$PYTHON-config --includes` ++if test "${PYTHON_INCLUDES+set}" = set; then ++ AC_MSG_NOTICE([PYTHON_INCLUDES overridden to: $PYTHON_INCLUDES]) ++else ++ if test -x "$PYTHON_CONFIG"; then ++ PYTHON_INCLUDES=`$PYTHON_CONFIG --includes 2>/dev/null` ++ else ++ PYTHON_INCLUDES=`$PYTHON -c "import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_inc(True))"` ++ PYTHON_INCLUDES="-I$PYTHON_INCLUDES" ++ fi ++fi ++ + AC_SUBST(PYTHON_INCLUDES) + dnl check if the headers exist: + save_CPPFLAGS="$CPPFLAGS" +-- +2.13.6 +
package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch new file +73 -0
73 lines not on this page · raw message
package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +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 <[email protected]> +--- + giscanner/ccompiler.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py +index a8bd5b1..51bb9bc 100644 +--- a/giscanner/ccompiler.py ++++ b/giscanner/ccompiler.py +@@ -163,6 +163,8 @@ class CCompiler(object): + + for envvar in runtime_path_envvar: + if envvar in os.environ: ++ for envvar_path in os.environ[envvar].split(':'): ++ args.append("-Wl,-rpath-link," + envvar_path) + os.environ[envvar] = \ + os.pathsep.join(runtime_paths + [os.environ[envvar]]) + else: +-- +2.14.3 +
package/gobject-introspection/Config.in new file +30 -0
@@ -0,0 +1,30 @@ +config BR2_PACKAGE_GOBJECT_INTROSPECTION + bool "gobject-introspection" + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS # libffi, libglib2 + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_MMU # python3, libglib2 + depends on BR2_USE_WCHAR # python3, libglib2 -> gettext + depends on !BR2_STATIC_LIBS + depends on !BR2_MIPS_NABI32 + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_HOST_QEMU + select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + help + GObject introspection is a middleware layer between C + libraries (using GObject) and language bindings. The C library + can be scanned at compile time and generate a metadata file, + in addition to the actual native C library. Then at runtime, + language bindings can read this metadata and automatically + provide bindings to call into the C library. + + https://wiki.gnome.org/action/show/Projects/GObjectIntrospection + +comment "gobject-introspection needs a glibc toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_USES_GLIBC
package/gobject-introspection/g-ir-compiler.in new file +2 -0
@@ -0,0 +1,2 @@ +#!/bin/sh +$STAGING_DIR/usr/bin/g-ir-scanner-qemuwrapper $STAGING_DIR/usr/bin/g-ir-compiler.real "$@"
package/gobject-introspection/g-ir-scanner-lddwrapper.in new file +2 -0
@@ -0,0 +1,2 @@ +#!/bin/sh +${HOST_DIR}/sbin/prelink-rtld --root=${STAGING_DIR} "$@"
package/gobject-introspection/g-ir-scanner-qemuwrapper.in new file +10 -0
@@ -0,0 +1,10 @@ +#!/bin/sh +# Use a modules directory which does not exist so we don't load random things +# which may then get deleted (or their dependencies) and potentially segfault +export GIO_MODULE_DIR=$STAGING_DIR/usr/lib/gio/modules-dummy +PSEUDO_UNLOAD=1 @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ -L $STAGING_DIR -E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:$STAGING_DIR/usr/lib:$STAGING_DIR/lib "$@" +if [[ $? -ne 0 ]]; then + echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help." + echo '(typically like this: GIR_EXTRA_LIBS_PATH="$(@D)/.libs")' + exit 1 +fi
package/gobject-introspection/g-ir-scanner.in new file +3 -0
@@ -0,0 +1,3 @@ +#!/bin/sh +export GI_SCANNER_DISABLE_CACHE=1 +$HOST_DIR/bin/g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=$STAGING_DIR/usr/bin/g-ir-scanner-qemuwrapper --use-ldd-wrapper=$STAGING_DIR/usr/bin/g-ir-scanner-lddwrapper --add-include-path=$STAGING_DIR/usr/share/gir-1.0 "$@"
package/gobject-introspection/gobject-introspection.hash new file +4 -0
@@ -0,0 +1,4 @@ +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.56/gobject-introspection-1.56.1.sha256sum +sha256 5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b gobject-introspection-1.56.1.tar.xz +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL
package/gobject-introspection/gobject-introspection.mk new file +98 -0
98 lines not on this page · raw message
package/pkg-autotools.mk +3 -0
@@ -162,6 +162,7 @@ endif $(2)_CONF_ENV ?= $(2)_CONF_OPTS ?= +$(2)_GIR_EXTRA_LIBS_PATH ?= $(2)_MAKE_ENV ?= $(2)_MAKE_OPTS ?= $(2)_INSTALL_OPTS ?= install
@@ -239,6 +240,8 @@ endef endif endif +export GIR_EXTRA_LIBS_PATH=$$($$(PKG)_GIR_EXTRA_LIBS_PATH) + $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK ifeq ($$($(2)_AUTORECONF),YES)
Signature · 1 line
2.17.1
PATCH v7 5/5 gstreamer1 packages: add support for introspection
In reply to Adam DuskettNow that there is support for gobject-introspection, we can add the appropriate configuration options to support compiling against gobject-introspection.
In addition: gst1-plugins-base requires a patch to drop a incorrect reference to sdp when compiling the rtsp gir file.
---
Changes v1 -> v4:
- Add patch to series.
Changes v4 -> v5:
- Changed --enable-introspection=yes to --enable-introspection (Yann)
- Changed += GIR_EXTRA_LIBS_PATH="$(@D)/gst/.libs:$(@D)/libs/gst/base/.libs"
to GSTREAMER1_GIR_EXTRA_LIBS_PATH=$(@D)/gst/.libs:$(@D)/libs/gst/base/.libs
Chagnes v5 -> v6:
- None
Changes v6 -> v7:
- Refresh for changes since v6.
.../gst1-plugins-bad/gst1-plugins-bad.mk | 5 ++++ ...ect-reference-to-gstreamer-sdp-in-Ma.patch | 26 +++++++++++++++++++ .../gst1-plugins-base/gst1-plugins-base.mk | 5 ++++ package/gstreamer1/gstreamer1/gstreamer1.mk | 6 +++++ 4 files changed, 42 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +5 -0
@@ -63,6 +63,11 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-introspection +GST1_PLUGINS_BAD_GIR_EXTRA_LIBS_PATH=$(@D)/gst-libs/gst/allocators/.libs +endif + ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) # RPI has odd locations for several required headers. GST1_PLUGINS_BAD_CONF_ENV += \
package/gstreamer1/gst1-plugins-base/0001-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 26 Oct 2015 17:30:14 +0200 +Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in Makefile.am + +Upstream-Status: Pending [review on oe-core maillist] +Signed-off-by: Alexander Kanavin <[email protected]> +Signed-off-by: Adam Duskett <[email protected]> +--- + gst-libs/gst/rtsp/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am +index 4f6d9f8..0afa370 100644 +--- a/gst-libs/gst/rtsp/Makefile.am ++++ b/gst-libs/gst/rtsp/Makefile.am +@@ -79,7 +79,6 @@ GstRtsp- at [email protected]: $(INTROSPECTION_SCANNER) libgstrtsp- at GST_API_VERS + --libtool="$(LIBTOOL)" \ + --pkg gio-2.0 \ + --pkg gstreamer- at GST_API_VERSION@ \ +- --pkg gstreamer-sdp- at GST_API_VERSION@ \ + --pkg-export gstreamer-rtsp- at GST_API_VERSION@ \ + --add-init-section="$(INTROSPECTION_INIT)" \ + --output $@ \ +-- +2.6.2
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +5 -0
@@ -25,6 +25,11 @@ GST1_PLUGINS_BASE_CONF_OPTS += \ GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GST1_PLUGINS_BASE_CONF_OPTS += --enable-introspection +GST1_PLUGINS_BASE_GIR_EXTRA_LIBS_PATH=$(@D)/gst-libs/gst/tag/.libs:$(@D)/gst-libs/gst/video/.libs:$(@D)/gst-libs/gst/audio/.libs:$(@D)/gst-libs/gst/rtp/.libs +endif + # These plugins are listed in the order from ./configure --help ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BASE_DEPENDENCIES += orc
package/gstreamer1/gstreamer1/gstreamer1.mk +6 -0
@@ -32,4 +32,10 @@ GSTREAMER1_DEPENDENCIES = \ libglib2 \ $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +GSTREAMER1_DEPENDENCIES += gobject-introspection +GSTREAMER1_CONF_OPTS += --enable-introspection +GSTREAMER1_GIR_EXTRA_LIBS_PATH=$(@D)/gst/.libs:$(@D)/libs/gst/base/.libs +endif + $(eval $(autotools-package))
Signature · 1 line
2.17.1