* [Buildroot] [PATCH v14 0/5] gobject-introspection: New package
@ 2019-10-21 20:04 aduskett at gmail.com
2019-10-21 20:04 ` [Buildroot] [PATCH v14 1/5] package/libiberty: new package aduskett at gmail.com
` (5 more replies)
0 siblings, 6 replies; 19+ messages in thread
From: aduskett at gmail.com @ 2019-10-21 20:04 UTC (permalink / raw)
To: buildroot
From: Adam Duskett <Aduskett@gmail.com>
Included in version 14 of the gobject-introspection patch series.
The patch series is almost identical with V13 except for one
significant change:
With permission from Arnout I have included the patch:
package/pkg-meson.mk: set Python sysconfigdata
However; the patch has one big flaw I would like to discuss:
The patch breaks libglib2 if a target-python is not selected or is not yet
built and installed before building target libglib2. Indeed, it would be
because we would pass _PYTHON_SYSCONFIGDATA_NAME="" as an environment
variable, which leads to the following error during libglib2-configure:
meson.build:1978:0: ERROR: <ExternalProgram 'python3' -> ['output/host/bin/python3']> is not a valid python or it is missing setuptools
However, I do believe the patch is a better direction to go than the previous
patch: package/meson: prevent python include path manipulation for two
significant reasons:
1) Meson does not have to be patched.
2) It fixes the suffix of built python applications that use meson
(such as newer versions of python-gobject.) With the old patch, the suffix
of the python libraries is -x86-64 even though the binaries themselves would
be the target architecture, which causes import errors on the target. With
this patch, the suffix is correct.
I propose keeping the patch but modifying it to work correctly if the
target-python isn't selected or isn't yet built. I need help however with this
as I am not great with makefile syntax this complex.
Thanks!
Adam
Adam Duskett (5):
package/libiberty: new package
package/prelink-cross: new package
package/gdb: depend on libiberty
package/pkg-meson.mk: set Python sysconfigdata
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 ++++++++++++++++++
...d-disable-tests-when-cross-compiling.patch | 27 +++
...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 | 26 +++
.../gobject-introspection/g-ir-compiler.in | 2 +
.../g-ir-scanner-lddwrapper.in | 2 +
.../g-ir-scanner-qemuwrapper.in | 17 ++
package/gobject-introspection/g-ir-scanner.in | 7 +
.../gobject-introspection.hash | 4 +
.../gobject-introspection.mk | 103 +++++++++++
package/libiberty/libiberty.hash | 2 +
package/libiberty/libiberty.mk | 27 +++
package/pkg-meson.mk | 3 +
package/prelink-cross/prelink-cross.hash | 3 +
package/prelink-cross/prelink-cross.mk | 16 ++
23 files changed, 672 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-meson.build-disable-tests-when-cross-compiling.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.21.0
^ permalink raw reply [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v14 1/5] package/libiberty: new package 2019-10-21 20:04 [Buildroot] [PATCH v14 0/5] gobject-introspection: New package aduskett at gmail.com @ 2019-10-21 20:04 ` aduskett at gmail.com 2020-01-16 10:33 ` Yegor Yefremov 2019-10-21 20:04 ` [Buildroot] [PATCH v14 2/5] package/prelink-cross: " aduskett at gmail.com ` (4 subsequent siblings) 5 siblings, 1 reply; 19+ messages in thread From: aduskett at gmail.com @ 2019-10-21 20:04 UTC (permalink / raw) To: buildroot From: Adam Duskett <Aduskett@gmail.com> Some packages, like prelink-cross, will 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 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 libiberty is usually bundled in packages, it usually only install a static version. Furthermore, it does not obey to the usual --enable-shared and --disable-static flags; it only ever builds a static version. Furthermore, this library is not built with -fPIC, but some packages may pick it to build shared objects. This 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 ensure it is always built before host-gdb. Signed-off-by: Adam Duskett <Aduskett@gmail.com> --- Changes v1 -> v11: - 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 906ccae006..f10711ee6a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2426,6 +2426,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.21.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 1/5] package/libiberty: new package 2019-10-21 20:04 ` [Buildroot] [PATCH v14 1/5] package/libiberty: new package aduskett at gmail.com @ 2020-01-16 10:33 ` Yegor Yefremov 0 siblings, 0 replies; 19+ messages in thread From: Yegor Yefremov @ 2020-01-16 10:33 UTC (permalink / raw) To: buildroot Hi Adam, On Mon, Oct 21, 2019 at 10:05 PM <aduskett@gmail.com> wrote: > > From: Adam Duskett <Aduskett@gmail.com> > > Some packages, like prelink-cross, will 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 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 libiberty is usually bundled in packages, it usually only > install a static version. Furthermore, it does not obey to the usual s/install/installs and perhaps remove "to" after obey Any plans for v15? Or are you waiting for the next gobject-introspection release that would make some related patches as obsolete? Regards, Yegor > --enable-shared and --disable-static flags; it only ever builds a > static version. > > Furthermore, this library is not built with -fPIC, but some packages > may pick it to build shared objects. This 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 ensure it is always built before host-gdb. > > Signed-off-by: Adam Duskett <Aduskett@gmail.com> > --- > Changes v1 -> v11: > - 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 906ccae006..f10711ee6a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2426,6 +2426,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.21.0 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 2/5] package/prelink-cross: new package 2019-10-21 20:04 [Buildroot] [PATCH v14 0/5] gobject-introspection: New package aduskett at gmail.com 2019-10-21 20:04 ` [Buildroot] [PATCH v14 1/5] package/libiberty: new package aduskett at gmail.com @ 2019-10-21 20:04 ` aduskett at gmail.com 2019-10-21 20:04 ` [Buildroot] [PATCH v14 3/5] package/gdb: depend on libiberty aduskett at gmail.com ` (3 subsequent siblings) 5 siblings, 0 replies; 19+ messages in thread From: aduskett at gmail.com @ 2019-10-21 20:04 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 f10711ee6a..fa2497155d 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/python3/ F: package/python-aioredis/ F: package/python-asgiref/ 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.21.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 3/5] package/gdb: depend on libiberty 2019-10-21 20:04 [Buildroot] [PATCH v14 0/5] gobject-introspection: New package aduskett at gmail.com 2019-10-21 20:04 ` [Buildroot] [PATCH v14 1/5] package/libiberty: new package aduskett at gmail.com 2019-10-21 20:04 ` [Buildroot] [PATCH v14 2/5] package/prelink-cross: " aduskett at gmail.com @ 2019-10-21 20:04 ` aduskett at gmail.com 2019-10-21 20:04 ` [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata aduskett at gmail.com ` (2 subsequent siblings) 5 siblings, 0 replies; 19+ messages in thread From: aduskett at gmail.com @ 2019-10-21 20:04 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: 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.21.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-21 20:04 [Buildroot] [PATCH v14 0/5] gobject-introspection: New package aduskett at gmail.com ` (2 preceding siblings ...) 2019-10-21 20:04 ` [Buildroot] [PATCH v14 3/5] package/gdb: depend on libiberty aduskett at gmail.com @ 2019-10-21 20:04 ` aduskett at gmail.com 2019-10-22 20:59 ` Thomas Petazzoni 2020-01-27 16:55 ` Giulio Benetti 2019-10-21 20:04 ` [Buildroot] [PATCH v14 5/5] package/gobject-introspection: new package aduskett at gmail.com 2020-01-26 20:42 ` [Buildroot] [PATCH v14 0/5] gobject-introspection: New package Giulio Benetti 5 siblings, 2 replies; 19+ messages in thread From: aduskett at gmail.com @ 2019-10-21 20:04 UTC (permalink / raw) To: buildroot From: Adam Duskett <Aduskett@gmail.com> meson has support for Python dependencies, to e.g. build Python modules. It parses Python's sysconfig module to find the appropriate configuration variables. However, the sysconfig module is the one for the host, _not_ for the target. Therefore, wrong values may be set. Many of them get overridden anyway by the cross-compilation.conf. One particular one that is problematic is that it uses the python-XXX.pc pkg-config file for the host instead of the target, because it explicitly sets the PKG_CONFIG_LIBDIR found in sysconfig. Use the same trick as for python package: pass PYTHONPATH, PYTHONNOUSERSITE and _PYTHON_SYSCONFIGDATA_NAME in the environment to point to staging instead of host. This ensures the sysconfig from the target is used instead of the one from the host. An alternative would be to patch meson to not use the PKG_CONFIG_LIBDIR from sysconfig. However, it is likely that other problems will pop up at some point because of using the wrong sysconfig. Note that this approach will still break things when meson needs to build something for the host during a target build. Signed-off-by: Adam Duskett <Aduskett@gmail.com> --- Changes v1 -> v14: - Add this patch to the series. package/pkg-meson.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 184a22a44a..b6360fb738 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -84,6 +84,9 @@ define $(2)_CONFIGURE_CMDS ) \ package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf + _PYTHON_SYSCONFIGDATA_NAME="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" \ + PYTHONPATH="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PYTHON3_PATH),$$(PYTHON_PATH))" \ + PYTHONNOUSERSITE=1 \ PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \ --prefix=/usr \ --libdir=lib \ -- 2.21.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-21 20:04 ` [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata aduskett at gmail.com @ 2019-10-22 20:59 ` Thomas Petazzoni 2019-10-22 21:58 ` Arnout Vandecappelle 2020-01-27 16:55 ` Giulio Benetti 1 sibling, 1 reply; 19+ messages in thread From: Thomas Petazzoni @ 2019-10-22 20:59 UTC (permalink / raw) To: buildroot On Mon, 21 Oct 2019 13:04:37 -0700 aduskett at gmail.com wrote: > + _PYTHON_SYSCONFIGDATA_NAME="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" \ Why do we need this conditional on BR2_PACKAGE_PYTHON3 ? package/pkg-python.mk is using PKG_PYTHON_SYSCONFIGDATA_NAME unconditionally, regardless of Python 2.x vs. Python 3.x. Could you explain this ? Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-22 20:59 ` Thomas Petazzoni @ 2019-10-22 21:58 ` Arnout Vandecappelle 2019-10-22 22:19 ` Arnout Vandecappelle 0 siblings, 1 reply; 19+ messages in thread From: Arnout Vandecappelle @ 2019-10-22 21:58 UTC (permalink / raw) To: buildroot Note that this patch was authored by me, Adam accidentally took over authorship (which is why he said on IRC he needs to send a v15). On 22/10/2019 22:59, Thomas Petazzoni wrote: > On Mon, 21 Oct 2019 13:04:37 -0700 > aduskett at gmail.com wrote: > >> + _PYTHON_SYSCONFIGDATA_NAME="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" \ > > Why do we need this conditional on BR2_PACKAGE_PYTHON3 ? > package/pkg-python.mk is using PKG_PYTHON_SYSCONFIGDATA_NAME > unconditionally, regardless of Python 2.x vs. Python 3.x. Could you > explain this ? I can :-) It's a mistake. I noticed that PKG_PYTHON_SYSCONFIGDATA_NAME was left empty for python2, so I made sure it got the correct value (in Python2 there is only one _sysconfigdata). However, python2 doesn't have the _PYTHON_SYSCONFIGDATA_NAME variable so it's meaningless. Should be tested if things work OK with python2 on target, but I expect they do. Regards, Arnout ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-22 21:58 ` Arnout Vandecappelle @ 2019-10-22 22:19 ` Arnout Vandecappelle 2019-10-23 19:48 ` Adam Duskett 2019-10-23 20:42 ` Adam Duskett 0 siblings, 2 replies; 19+ messages in thread From: Arnout Vandecappelle @ 2019-10-22 22:19 UTC (permalink / raw) To: buildroot On 22/10/2019 23:58, Arnout Vandecappelle wrote: > Note that this patch was authored by me, Adam accidentally took over authorship > (which is why he said on IRC he needs to send a v15). > > On 22/10/2019 22:59, Thomas Petazzoni wrote: >> On Mon, 21 Oct 2019 13:04:37 -0700 >> aduskett at gmail.com wrote: >> >>> + _PYTHON_SYSCONFIGDATA_NAME="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" \ >> >> Why do we need this conditional on BR2_PACKAGE_PYTHON3 ? >> package/pkg-python.mk is using PKG_PYTHON_SYSCONFIGDATA_NAME >> unconditionally, regardless of Python 2.x vs. Python 3.x. Could you >> explain this ? > > I can :-) > > It's a mistake. I noticed that PKG_PYTHON_SYSCONFIGDATA_NAME was left empty for > python2, so I made sure it got the correct value (in Python2 there is only one > _sysconfigdata). However, python2 doesn't have the _PYTHON_SYSCONFIGDATA_NAME > variable so it's meaningless. > > Should be tested if things work OK with python2 on target, but I expect they do. I hadn't read Adam's remark in the cover letter yet, about how this patch breaks the build of libglib2. I suspect that we shold not set _PYTHON_SYSCONFIGDATA_NAME if python3 is not selected. Indeed, python3 *will* observe this environment variable, but if target python3 is not selected, it will be empty. meson will do checks for host-python, and setting that environment variable will break the check (which is BTW an example of the comment I made in the commit log of this patch: "Note that this approach will still break things when meson needs to build something for the host during a target build."). libglib2 indeed does use python3 during the build, so it asks meson to check for it, but since it doesn't try to build C modules for the host, it still works even with a wrong _sysconfigdata. Adam, could you test if this works better? + $$(if $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME)") \ Regards, Arnout ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-22 22:19 ` Arnout Vandecappelle @ 2019-10-23 19:48 ` Adam Duskett 2019-10-23 20:42 ` Adam Duskett 1 sibling, 0 replies; 19+ messages in thread From: Adam Duskett @ 2019-10-23 19:48 UTC (permalink / raw) To: buildroot Hey Arnout; I absolutely can! I will do so today, and if it works, I will send a V15 with you as the author of the patch. Thanks! Adam On Tue, Oct 22, 2019 at 3:19 PM Arnout Vandecappelle <arnout@mind.be> wrote: > > > > On 22/10/2019 23:58, Arnout Vandecappelle wrote: > > Note that this patch was authored by me, Adam accidentally took over authorship > > (which is why he said on IRC he needs to send a v15). > > > > On 22/10/2019 22:59, Thomas Petazzoni wrote: > >> On Mon, 21 Oct 2019 13:04:37 -0700 > >> aduskett at gmail.com wrote: > >> > >>> + _PYTHON_SYSCONFIGDATA_NAME="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" \ > >> > >> Why do we need this conditional on BR2_PACKAGE_PYTHON3 ? > >> package/pkg-python.mk is using PKG_PYTHON_SYSCONFIGDATA_NAME > >> unconditionally, regardless of Python 2.x vs. Python 3.x. Could you > >> explain this ? > > > > I can :-) > > > > It's a mistake. I noticed that PKG_PYTHON_SYSCONFIGDATA_NAME was left empty for > > python2, so I made sure it got the correct value (in Python2 there is only one > > _sysconfigdata). However, python2 doesn't have the _PYTHON_SYSCONFIGDATA_NAME > > variable so it's meaningless. > > > > Should be tested if things work OK with python2 on target, but I expect they do. > > I hadn't read Adam's remark in the cover letter yet, about how this patch > breaks the build of libglib2. > > I suspect that we shold not set _PYTHON_SYSCONFIGDATA_NAME if python3 is not > selected. Indeed, python3 *will* observe this environment variable, but if > target python3 is not selected, it will be empty. meson will do checks for > host-python, and setting that environment variable will break the check (which > is BTW an example of the comment I made in the commit log of this patch: "Note > that this approach will still break things when meson needs to build something > for the host during a target build."). libglib2 indeed does use python3 during > the build, so it asks meson to check for it, but since it doesn't try to build C > modules for the host, it still works even with a wrong _sysconfigdata. > > Adam, could you test if this works better? > > + $$(if > $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME)") > \ > > > > Regards, > Arnout ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-22 22:19 ` Arnout Vandecappelle 2019-10-23 19:48 ` Adam Duskett @ 2019-10-23 20:42 ` Adam Duskett 2019-10-23 20:50 ` Thomas Petazzoni 1 sibling, 1 reply; 19+ messages in thread From: Adam Duskett @ 2019-10-23 20:42 UTC (permalink / raw) To: buildroot Arnout: On Tue, Oct 22, 2019 at 3:19 PM Arnout Vandecappelle <arnout@mind.be> wrote: > > > > On 22/10/2019 23:58, Arnout Vandecappelle wrote: > > Note that this patch was authored by me, Adam accidentally took over authorship > > (which is why he said on IRC he needs to send a v15). > > > > On 22/10/2019 22:59, Thomas Petazzoni wrote: > >> On Mon, 21 Oct 2019 13:04:37 -0700 > >> aduskett at gmail.com wrote: > >> > >>> + _PYTHON_SYSCONFIGDATA_NAME="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" \ > >> > >> Why do we need this conditional on BR2_PACKAGE_PYTHON3 ? > >> package/pkg-python.mk is using PKG_PYTHON_SYSCONFIGDATA_NAME > >> unconditionally, regardless of Python 2.x vs. Python 3.x. Could you > >> explain this ? > > > > I can :-) > > > > It's a mistake. I noticed that PKG_PYTHON_SYSCONFIGDATA_NAME was left empty for > > python2, so I made sure it got the correct value (in Python2 there is only one > > _sysconfigdata). However, python2 doesn't have the _PYTHON_SYSCONFIGDATA_NAME > > variable so it's meaningless. > > > > Should be tested if things work OK with python2 on target, but I expect they do. > > I hadn't read Adam's remark in the cover letter yet, about how this patch > breaks the build of libglib2. > > I suspect that we shold not set _PYTHON_SYSCONFIGDATA_NAME if python3 is not > selected. Indeed, python3 *will* observe this environment variable, but if > target python3 is not selected, it will be empty. meson will do checks for > host-python, and setting that environment variable will break the check (which > is BTW an example of the comment I made in the commit log of this patch: "Note > that this approach will still break things when meson needs to build something > for the host during a target build."). libglib2 indeed does use python3 during > the build, so it asks meson to check for it, but since it doesn't try to build C > modules for the host, it still works even with a wrong _sysconfigdata. > > Adam, could you test if this works better? > > + $$(if > $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME)") > \ $$(if $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" Also does not work, because the target python3 may not yet be built. > > > > Regards, > Arnout ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-23 20:42 ` Adam Duskett @ 2019-10-23 20:50 ` Thomas Petazzoni 2019-10-23 21:03 ` Arnout Vandecappelle 0 siblings, 1 reply; 19+ messages in thread From: Thomas Petazzoni @ 2019-10-23 20:50 UTC (permalink / raw) To: buildroot On Wed, 23 Oct 2019 13:42:54 -0700 Adam Duskett <aduskett@gmail.com> wrote: > > Adam, could you test if this works better? > > > > + $$(if > > $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME)") > > \ > $$(if $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" > Also does not work, because the target python3 may not yet be built. But that is totally unrelated to the _sysconfigdata "fallback" that I was criticizing. The issue of "you're passing _PYTHON_SYSCONFIG_DATA_NAME regardless of whether Python was built before or not" was already present in your initial submission. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-23 20:50 ` Thomas Petazzoni @ 2019-10-23 21:03 ` Arnout Vandecappelle 2019-10-23 21:27 ` Arnout Vandecappelle 0 siblings, 1 reply; 19+ messages in thread From: Arnout Vandecappelle @ 2019-10-23 21:03 UTC (permalink / raw) To: buildroot On 23/10/2019 22:50, Thomas Petazzoni wrote: > On Wed, 23 Oct 2019 13:42:54 -0700 > Adam Duskett <aduskett@gmail.com> wrote: > >>> Adam, could you test if this works better? >>> >>> + $$(if >>> $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME)") >>> \ >> $$(if $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" >> Also does not work, because the target python3 may not yet be built. Ugh indeed, another side effect of this environment being used for both "host" python and "cross" python... I'm starting to think this is not such a good solution after all... > But that is totally unrelated to the _sysconfigdata "fallback" that I > was criticizing. The issue of "you're passing > _PYTHON_SYSCONFIG_DATA_NAME regardless of whether Python was built > before or not" was already present in your initial submission. With "initial submission", do you mean *my* initial submission (i.e. this patch 4/5 from v14), or Adam's initial submission which patched meson itself and which was taken over from yocto? The latter did not actually change sysconfigdata at all; instead it patched meson to not make use of the pkg_config_libdir that comes out of sysconfigdata (which is I think the only thing from sysconfigdata that is actually used by meson). I'll dive into the meson code again to see if I can find something better... Regards, Arnout ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-23 21:03 ` Arnout Vandecappelle @ 2019-10-23 21:27 ` Arnout Vandecappelle 2019-10-24 16:22 ` Adam Duskett 0 siblings, 1 reply; 19+ messages in thread From: Arnout Vandecappelle @ 2019-10-23 21:27 UTC (permalink / raw) To: buildroot On 23/10/2019 23:03, Arnout Vandecappelle wrote: > > > On 23/10/2019 22:50, Thomas Petazzoni wrote: >> On Wed, 23 Oct 2019 13:42:54 -0700 >> Adam Duskett <aduskett@gmail.com> wrote: >> >>>> Adam, could you test if this works better? >>>> >>>> + $$(if >>>> $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME)") >>>> \ >>> $$(if $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" >>> Also does not work, because the target python3 may not yet be built. > > Ugh indeed, another side effect of this environment being used for both "host" > python and "cross" python... > > I'm starting to think this is not such a good solution after all... > > >> But that is totally unrelated to the _sysconfigdata "fallback" that I >> was criticizing. The issue of "you're passing >> _PYTHON_SYSCONFIG_DATA_NAME regardless of whether Python was built >> before or not" was already present in your initial submission. > > With "initial submission", do you mean *my* initial submission (i.e. this patch > 4/5 from v14), or Adam's initial submission which patched meson itself and which > was taken over from yocto? The latter did not actually change sysconfigdata at > all; instead it patched meson to not make use of the pkg_config_libdir that > comes out of sysconfigdata (which is I think the only thing from sysconfigdata > that is actually used by meson). > > I'll dive into the meson code again to see if I can find something better... OK, I *think* I've come up with an alternative (but I'm sure as hell not going to implement it :-). Essentially, it's the same issue as for pkg-config: we should distinguish between the host version and the cross version (i.e. executable that can run on the host but that returns results for the target). Meson is very explicit about such a distinction, so anything pertaining to cross-compilation should be passed through cross-compilation.conf instead of in the environment. As far as I can see in the source code, we can in fact set a "cross-compilation" python in the [binaries] section. So, we could create a python wrapper that sets those environment variables, and point to that python wrapper in the cross-compilation.conf. And of course, we can use the same approach in pkg-python.mk: set $(2)_PYTHON_INTERPRETER to the python wrapper instead of $(HOST_DIR)/bin/python. Regards, Arnout ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-23 21:27 ` Arnout Vandecappelle @ 2019-10-24 16:22 ` Adam Duskett 0 siblings, 0 replies; 19+ messages in thread From: Adam Duskett @ 2019-10-24 16:22 UTC (permalink / raw) To: buildroot This might be a good solution, but it is beyond my skillset to implement it properly. If the rest of the series looks good, perhaps we could come up with a solution during the developer conference and them implement GOI? Regards; Adam On Wed, Oct 23, 2019 at 2:27 PM Arnout Vandecappelle <arnout@mind.be> wrote: > > > > On 23/10/2019 23:03, Arnout Vandecappelle wrote: > > > > > > On 23/10/2019 22:50, Thomas Petazzoni wrote: > >> On Wed, 23 Oct 2019 13:42:54 -0700 > >> Adam Duskett <aduskett@gmail.com> wrote: > >> > >>>> Adam, could you test if this works better? > >>>> > >>>> + $$(if > >>>> $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME)") > >>>> \ > >>> $$(if $$(BR2_PACKAGE_PYTHON3),_PYTHON_SYSCONFIGDATA_NAME="$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" > >>> Also does not work, because the target python3 may not yet be built. > > > > Ugh indeed, another side effect of this environment being used for both "host" > > python and "cross" python... > > > > I'm starting to think this is not such a good solution after all... > > > > > >> But that is totally unrelated to the _sysconfigdata "fallback" that I > >> was criticizing. The issue of "you're passing > >> _PYTHON_SYSCONFIG_DATA_NAME regardless of whether Python was built > >> before or not" was already present in your initial submission. > > > > With "initial submission", do you mean *my* initial submission (i.e. this patch > > 4/5 from v14), or Adam's initial submission which patched meson itself and which > > was taken over from yocto? The latter did not actually change sysconfigdata at > > all; instead it patched meson to not make use of the pkg_config_libdir that > > comes out of sysconfigdata (which is I think the only thing from sysconfigdata > > that is actually used by meson). > > > > I'll dive into the meson code again to see if I can find something better... > > OK, I *think* I've come up with an alternative (but I'm sure as hell not going > to implement it :-). > > > Essentially, it's the same issue as for pkg-config: we should distinguish > between the host version and the cross version (i.e. executable that can run on > the host but that returns results for the target). Meson is very explicit about > such a distinction, so anything pertaining to cross-compilation should be passed > through cross-compilation.conf instead of in the environment. > > As far as I can see in the source code, we can in fact set a > "cross-compilation" python in the [binaries] section. So, we could create a > python wrapper that sets those environment variables, and point to that python > wrapper in the cross-compilation.conf. > > And of course, we can use the same approach in pkg-python.mk: set > $(2)_PYTHON_INTERPRETER to the python wrapper instead of $(HOST_DIR)/bin/python. > > > Regards, > Arnout ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata 2019-10-21 20:04 ` [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata aduskett at gmail.com 2019-10-22 20:59 ` Thomas Petazzoni @ 2020-01-27 16:55 ` Giulio Benetti 1 sibling, 0 replies; 19+ messages in thread From: Giulio Benetti @ 2020-01-27 16:55 UTC (permalink / raw) To: buildroot Hi, this patch breaks pkg-meson.mk on building glib2, as suggested by Adam lets substitute it with this patch: https://patchwork.ozlabs.org/patch/1120929/ Best regards -- Giulio Benetti Benetti Engineering sas On 10/21/19 10:04 PM, aduskett at gmail.com wrote: > From: Adam Duskett <Aduskett@gmail.com> > > meson has support for Python dependencies, to e.g. build Python modules. > It parses Python's sysconfig module to find the appropriate > configuration variables. However, the sysconfig module is the one for > the host, _not_ for the target. Therefore, wrong values may be set. Many > of them get overridden anyway by the cross-compilation.conf. One > particular one that is problematic is that it uses the python-XXX.pc > pkg-config file for the host instead of the target, because it > explicitly sets the PKG_CONFIG_LIBDIR found in sysconfig. > > Use the same trick as for python package: pass PYTHONPATH, > PYTHONNOUSERSITE and _PYTHON_SYSCONFIGDATA_NAME in the environment to > point to staging instead of host. This ensures the sysconfig from the > target is used instead of the one from the host. > > An alternative would be to patch meson to not use the PKG_CONFIG_LIBDIR > from sysconfig. However, it is likely that other problems will pop up at > some point because of using the wrong sysconfig. > > Note that this approach will still break things when meson needs to > build something for the host during a target build. > > Signed-off-by: Adam Duskett <Aduskett@gmail.com> > --- > Changes v1 -> v14: > - Add this patch to the series. > > package/pkg-meson.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 184a22a44a..b6360fb738 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -84,6 +84,9 @@ define $(2)_CONFIGURE_CMDS > ) \ > package/meson/cross-compilation.conf.in \ > > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf > + _PYTHON_SYSCONFIGDATA_NAME="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PKG_PYTHON_SYSCONFIGDATA_NAME),_sysconfigdata)" \ > + PYTHONPATH="$$(if $$(BR2_PACKAGE_PYTHON3),$$(PYTHON3_PATH),$$(PYTHON_PATH))" \ > + PYTHONNOUSERSITE=1 \ > PATH=$$(BR_PATH) $$($$(PKG)_CONF_ENV) $$(MESON) \ > --prefix=/usr \ > --libdir=lib \ > ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 5/5] package/gobject-introspection: new package 2019-10-21 20:04 [Buildroot] [PATCH v14 0/5] gobject-introspection: New package aduskett at gmail.com ` (3 preceding siblings ...) 2019-10-21 20:04 ` [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata aduskett at gmail.com @ 2019-10-21 20:04 ` aduskett at gmail.com 2020-02-04 10:53 ` Arnout Vandecappelle 2020-01-26 20:42 ` [Buildroot] [PATCH v14 0/5] gobject-introspection: New package Giulio Benetti 5 siblings, 1 reply; 19+ messages in thread From: aduskett at gmail.com @ 2019-10-21 20:04 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 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 cross compiling with meson. 3) Disable tests when cross-compiling. 4) Add support for the various wrappers. (See patch for details.) 5) 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. 6) Add an option to use an LDD wrapper, again, useful for cross-compiled environments. 7) Add a --lib-dirs-envar option to pass to giscanner. (See patch for details.) 8) 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. 9) Ignore error return codes from ldd-wrapper because prelink-rtld returns 127 when it can't find a library, which will break subprocess.check_output(). Signed-off-by: Adam Duskett <Aduskett@gmail.com> --- 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 ++++++++++++++++++ ...d-disable-tests-when-cross-compiling.patch | 27 +++ ...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 | 26 +++ .../gobject-introspection/g-ir-compiler.in | 2 + .../g-ir-scanner-lddwrapper.in | 2 + .../g-ir-scanner-qemuwrapper.in | 17 ++ package/gobject-introspection/g-ir-scanner.in | 7 + .../gobject-introspection.hash | 4 + .../gobject-introspection.mk | 103 +++++++++++ 17 files changed, 616 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-meson.build-disable-tests-when-cross-compiling.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 fa2497155d..cd58877d92 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 c8ff524e83..21aa631bad 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1715,6 +1715,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-meson.build-disable-tests-when-cross-compiling.patch b/package/gobject-introspection/0003-meson.build-disable-tests-when-cross-compiling.patch new file mode 100644 index 0000000000..10d592272a --- /dev/null +++ b/package/gobject-introspection/0003-meson.build-disable-tests-when-cross-compiling.patch @@ -0,0 +1,27 @@ +From 2c384187cc22113c0c9b1cd233948118f7c085ef Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 25 Mar 2019 13:28:48 +0100 +Subject: [PATCH] meson.build: disable tests when cross-compiling + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/64] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Adam Duskett <aduskett@gmail.com> +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2544ff3..4c16fe5 100644 +--- a/meson.build ++++ b/meson.build +@@ -168,7 +168,9 @@ if get_option('enable-introspection-data') == true + endif + subdir('examples') + subdir('docs') +-subdir('tests') ++if not meson.is_cross_build() ++ subdir('tests') ++endif + + 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')) 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..b93d5e4c45 --- /dev/null +++ b/package/gobject-introspection/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_GOBJECT_INTROSPECTION + bool "gobject-introspection" + 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" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in new file mode 100644 index 0000000000..579fd53fa4 --- /dev/null +++ b/package/gobject-introspection/g-ir-compiler.in @@ -0,0 +1,2 @@ +#!/bin/sh +$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/g-ir-compiler.real "$@" diff --git a/package/gobject-introspection/g-ir-scanner-lddwrapper.in b/package/gobject-introspection/g-ir-scanner-lddwrapper.in new file mode 100644 index 0000000000..02f5c2883d --- /dev/null +++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in @@ -0,0 +1,2 @@ +#!/bin/sh +${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../../ "$@" 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..b69222d27a --- /dev/null +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in @@ -0,0 +1,17 @@ +#!/bin/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)/../lib/gio/modules-dummy \ + at QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ +-L $(dirname $0)/../../ \ +-E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:$(dirname $0)/../lib:$(dirname $0)/../../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..09530aad56 --- /dev/null +++ b/package/gobject-introspection/g-ir-scanner.in @@ -0,0 +1,7 @@ +#!/bin/sh +export GI_SCANNER_DISABLE_CACHE=1 +$HOST_DIR/bin/g-ir-scanner \ +--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)/../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..57f7e9bec8 --- /dev/null +++ b/package/gobject-introspection/gobject-introspection.mk @@ -0,0 +1,103 @@ +################################################################################ +# +# 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+ or GPL-2.0+ +GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL + +GOBJECT_INTROSPECTION_DEPENDENCIES = \ + host-autoconf-archive \ + host-gobject-introspection \ + host-prelink-cross \ + python3 \ + host-qemu \ + libffi \ + libglib2 \ + 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)" + +# 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="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \ + -Denable-gi-ldd-wrapper="$(STAGING_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 +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ + GI_SCANNER_DISABLE_CACHE=1 + +# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to $HOME +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_PRE_WRAPPERS + $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper + $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + $(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + $(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + # 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_POST_PATCH_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS + +# Move the real compiler and scanner to .real, and replace them with the wrappers. +define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS + # Move the real binaries to their names.real, then replace them with + # the wrappers. + $(foreach w,g-ir-compiler g-ir-scanner, + mv $(STAGING_DIR)/usr/bin/$(w) $(STAGING_DIR)/usr/bin/$(w).real + $(INSTALL) -D -m 755 \ + $(GOBJECT_INTROSPECTION_PKGDIR)/$(w).in $(STAGING_DIR)/usr/bin/$(w) + ) + $(SED) "s%toolsdir=.*%toolsdir=$(STAGING_DIR)/usr/bin%g" \ + $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc +endef +GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS + +# Only .typelib files are needed to run. +define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES + find $(TARGET_DIR)/usr/share/ -name '*.gir' -print0 | xargs -0 rm -f + find $(TARGET_DIR)/usr/share/ -name '*.rnc' -print0 | xargs -0 rm -f +endef +GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES + +$(eval $(meson-package)) +$(eval $(host-meson-package)) -- 2.21.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 5/5] package/gobject-introspection: new package 2019-10-21 20:04 ` [Buildroot] [PATCH v14 5/5] package/gobject-introspection: new package aduskett at gmail.com @ 2020-02-04 10:53 ` Arnout Vandecappelle 0 siblings, 0 replies; 19+ messages in thread From: Arnout Vandecappelle @ 2020-02-04 10:53 UTC (permalink / raw) To: buildroot Just a few minor comments :-) On 21/10/2019 22:04, aduskett at gmail.com wrote: [snip] > 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 cross compiling with meson. > > 3) Disable tests when cross-compiling. > > 4) Add support for the various wrappers. (See patch for details.) > > 5) 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. > > 6) Add an option to use an LDD wrapper, again, useful for cross-compiled > environments. > > 7) Add a --lib-dirs-envar option to pass to giscanner. (See patch for details.) > > 8) 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. > > 9) Ignore error return codes from ldd-wrapper because prelink-rtld returns 127 > when it can't find a library, which will break subprocess.check_output(). I count just 8 patches, and only one of them is by you. [snip] > +++ 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> Did you send this patch upstream? Looks perfectly upstreamable to me. > +--- > + 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:[snip] > +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+ or GPL-2.0+ It's AND, not OR, so 'GPL-2.0+, LGPL-2.0+' (I prefer to put GPL first because it's stronger). Also some files are BSD-2-Clause. > +GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL Unfortunately no license file for the BSD, so the best we can do is giscanner/scannerlexer.l > + > +GOBJECT_INTROSPECTION_DEPENDENCIES = \ > + host-autoconf-archive \ > + host-gobject-introspection \ > + host-prelink-cross \ > + python3 \ > + host-qemu \ > + libffi \ > + libglib2 \ > + zlib Nitpick: I like dependences to be sorted. > +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)" > + > +# 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="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \ > + -Denable-gi-ldd-wrapper="$(STAGING_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 > +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ > + GI_SCANNER_DISABLE_CACHE=1 > + > +# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to $HOME > +GOBJECT_INTROSPECTION_CONF_ENV = \ > + GI_SCANNER_DISABLE_CACHE=1 Nitpick: we usually put the target first, then the host (which is not entirely logical, because you first build the host and then the target; but ok). Also, no need to repeat the comment. # 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_PRE_WRAPPERS > + $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \ > + $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper > + $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \ > + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper > + $(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \ > + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper > + $(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \ > + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper > + # 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_POST_PATCH_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS Don't mess with staging in a post-patch hook. Ideally it should be done in a install hook, but that's difficult in this case. But still, move it to a pre-configure or pre-build hook. Or maybe better: install them in HOST_DIR/bin during the install of host-gobject-introspection. It means we can't use the relative paths to STAGING_DIR in those scripts any more, but we can just use the STAGING_DIR environment variable (which gets exported anyway, just like HOST_DIR). Or better yet, use the relative path $(dirname $0)/../@GNU_TARGET_NAME@/sysroot so it is fully relocatable. > + > +# Move the real compiler and scanner to .real, and replace them with the wrappers. Can you add why the wrapper is needed? > +define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS > + # Move the real binaries to their names.real, then replace them with > + # the wrappers. No need to repeat that comment :-) > + $(foreach w,g-ir-compiler g-ir-scanner, > + mv $(STAGING_DIR)/usr/bin/$(w) $(STAGING_DIR)/usr/bin/$(w).real > + $(INSTALL) -D -m 755 \ > + $(GOBJECT_INTROSPECTION_PKGDIR)/$(w).in $(STAGING_DIR)/usr/bin/$(w) > + ) I think it's better to put these in HOST_DIR as well. It's better for packages that use g-ir-scanner/compiler, because they can find it in $PATH (with the usual problem that there's no distinction between native and cross compilation, but we don't really expect to need any native goi stuff, right?). > + $(SED) "s%toolsdir=.*%toolsdir=$(STAGING_DIR)/usr/bin%g" \ > + $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc > +endef > +GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS > + > +# Only .typelib files are needed to run. Good call! > +define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES > + find $(TARGET_DIR)/usr/share/ -name '*.gir' -print0 | xargs -0 rm -f > + find $(TARGET_DIR)/usr/share/ -name '*.rnc' -print0 | xargs -0 rm -f I believe you can do find $(TARGET_DIR)/usr/share \( -name '*.gir' -o '*.rnc' \) -delete Regards, Arnout > +endef > +GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES > + > +$(eval $(meson-package)) > +$(eval $(host-meson-package)) > ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v14 0/5] gobject-introspection: New package 2019-10-21 20:04 [Buildroot] [PATCH v14 0/5] gobject-introspection: New package aduskett at gmail.com ` (4 preceding siblings ...) 2019-10-21 20:04 ` [Buildroot] [PATCH v14 5/5] package/gobject-introspection: new package aduskett at gmail.com @ 2020-01-26 20:42 ` Giulio Benetti 5 siblings, 0 replies; 19+ messages in thread From: Giulio Benetti @ 2020-01-26 20:42 UTC (permalink / raw) To: buildroot Hi Adam, I'm bumping udisks which has new dependency libblockdev that in order needs gobject-introspection and also libbytesize and volume_key that I'm going to send patches for. So I'm testing this patch series. Only needed to rebase a little and update to latest gobject-introspection version(1.63.2). I'll let you know all the results. You can follow the udisks version bumping at: https://elinux.org/Buildroot#Important Kind regards -- Giulio Benetti Benetti Engineering sas On 10/21/19 10:04 PM, aduskett at gmail.com wrote: > From: Adam Duskett <Aduskett@gmail.com> > > Included in version 14 of the gobject-introspection patch series. > The patch series is almost identical with V13 except for one > significant change: > > With permission from Arnout I have included the patch: > package/pkg-meson.mk: set Python sysconfigdata > However; the patch has one big flaw I would like to discuss: > > The patch breaks libglib2 if a target-python is not selected or is not yet > built and installed before building target libglib2. Indeed, it would be > because we would pass _PYTHON_SYSCONFIGDATA_NAME="" as an environment > variable, which leads to the following error during libglib2-configure: > meson.build:1978:0: ERROR: <ExternalProgram 'python3' -> ['output/host/bin/python3']> is not a valid python or it is missing setuptools > > However, I do believe the patch is a better direction to go than the previous > patch: package/meson: prevent python include path manipulation for two > significant reasons: > > 1) Meson does not have to be patched. > 2) It fixes the suffix of built python applications that use meson > (such as newer versions of python-gobject.) With the old patch, the suffix > of the python libraries is -x86-64 even though the binaries themselves would > be the target architecture, which causes import errors on the target. With > this patch, the suffix is correct. > > I propose keeping the patch but modifying it to work correctly if the > target-python isn't selected or isn't yet built. I need help however with this > as I am not great with makefile syntax this complex. > > Thanks! > > Adam > > > Adam Duskett (5): > package/libiberty: new package > package/prelink-cross: new package > package/gdb: depend on libiberty > package/pkg-meson.mk: set Python sysconfigdata > 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 ++++++++++++++++++ > ...d-disable-tests-when-cross-compiling.patch | 27 +++ > ...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 | 26 +++ > .../gobject-introspection/g-ir-compiler.in | 2 + > .../g-ir-scanner-lddwrapper.in | 2 + > .../g-ir-scanner-qemuwrapper.in | 17 ++ > package/gobject-introspection/g-ir-scanner.in | 7 + > .../gobject-introspection.hash | 4 + > .../gobject-introspection.mk | 103 +++++++++++ > package/libiberty/libiberty.hash | 2 + > package/libiberty/libiberty.mk | 27 +++ > package/pkg-meson.mk | 3 + > package/prelink-cross/prelink-cross.hash | 3 + > package/prelink-cross/prelink-cross.mk | 16 ++ > 23 files changed, 672 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-meson.build-disable-tests-when-cross-compiling.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] 19+ messages in thread
end of thread, other threads:[~2020-02-04 10:53 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-10-21 20:04 [Buildroot] [PATCH v14 0/5] gobject-introspection: New package aduskett at gmail.com 2019-10-21 20:04 ` [Buildroot] [PATCH v14 1/5] package/libiberty: new package aduskett at gmail.com 2020-01-16 10:33 ` Yegor Yefremov 2019-10-21 20:04 ` [Buildroot] [PATCH v14 2/5] package/prelink-cross: " aduskett at gmail.com 2019-10-21 20:04 ` [Buildroot] [PATCH v14 3/5] package/gdb: depend on libiberty aduskett at gmail.com 2019-10-21 20:04 ` [Buildroot] [PATCH v14 4/5] package/pkg-meson.mk: set Python sysconfigdata aduskett at gmail.com 2019-10-22 20:59 ` Thomas Petazzoni 2019-10-22 21:58 ` Arnout Vandecappelle 2019-10-22 22:19 ` Arnout Vandecappelle 2019-10-23 19:48 ` Adam Duskett 2019-10-23 20:42 ` Adam Duskett 2019-10-23 20:50 ` Thomas Petazzoni 2019-10-23 21:03 ` Arnout Vandecappelle 2019-10-23 21:27 ` Arnout Vandecappelle 2019-10-24 16:22 ` Adam Duskett 2020-01-27 16:55 ` Giulio Benetti 2019-10-21 20:04 ` [Buildroot] [PATCH v14 5/5] package/gobject-introspection: new package aduskett at gmail.com 2020-02-04 10:53 ` Arnout Vandecappelle 2020-01-26 20:42 ` [Buildroot] [PATCH v14 0/5] gobject-introspection: New package Giulio Benetti
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox