NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/gobject-introspection: export variables in g-ir-scanner

Browse Source 
When building .gir .typelib files, the g-ir-scanner wrapper calls the host
g-ir-scanner. g-ir-scanner calls ccompiler.py, which searches for the following
environment variables:
    CPP, CC, CXX, CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS

These environment variables are empty by default, and as such ccompiler.py
defaults to either using the system tools (CC, CXX, and CPP) or leaving
the variables blank (LDFLAGS, CFLAGS, and CPPFLAGS.)

For autotools packages, this issue does not occur because autotools uses
Makefile.introspection found on the staging directory in
usr/share/gobject-introspection-1.0/ which automatically exports the above
variables.

However, for meson, the above variables are not exported when meson calls
g-ir-scanner to build .gir and .typelib files, which results in linking errors.

Exporting these variables in the g-ir-scanner wrapper fixes these issues and
ensures all build systems can generate .gir and .typelib files properly.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Tested-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Adam Duskett 2020-03-15 16:33:20 +01:00 committed by Yann E. MORIN
parent 8270fca228
commit 3ff152386a
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/gobject-introspection/g-ir-scanner.in
View File

@ -1,6 +1,20 @@
#!/usr/bin/env bash
# These environment variables are empty by default, and as such ccompiler.py
# defaults to either using the system tools (CC, CXX, and CPP) or leaving
# the variables blank (LDFLAGS, CFLAGS, and CPPFLAGS.)
# Export these variables to ensure all build systems can generate .gir and
# .typelib files properly.
export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}"
export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}"
export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}"
export CPPFLAGS="${CPPFLAGS:-@TARGET_CPPFLAGS@}"
export CFLAGS="${CFLAGS:-@TARGET_CFLAGS@}"
export CXXFLAGS="${CXXFLAGS:-@TARGET_CXXFLAGS@}"
export LDFLAGS="${LDFLAGS:-@TARGET_LDFLAGS@}"
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 \

9
package/gobject-introspection/gobject-introspection.mk
View File

@ -105,6 +105,15 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
$(INSTALL) -D -m 755 \
$(GOBJECT_INTROSPECTION_PKGDIR)/$(w).in $(STAGING_DIR)/usr/bin/$(w)
)
$(SED) "s%@BASENAME_TARGET_CPP@%$(notdir $(TARGET_CPP))%g" \
-e "s%@BASENAME_TARGET_CC@%$(notdir $(TARGET_CC))%g" \
-e "s%@BASENAME_TARGET_CXX@%$(notdir $(TARGET_CXX))%g" \
-e "s%@TARGET_CPPFLAGS@%$(TARGET_CPPFLAGS)%g" \
-e "s%@TARGET_CFLAGS@%$(TARGET_CFLAGS)%g" \
-e "s%@TARGET_CXXFLAGS@%$(TARGET_CXXFLAGS)%g" \
-e "s%@TARGET_LDFLAGS@%$(TARGET_LDFLAGS)%g" \
$(STAGING_DIR)/usr/bin/g-ir-scanner
# Gobject-introspection installs Makefile.introspection in
# $(STAGING_DIR)/usr/share which is needed for autotools-based programs to
# build .gir and .typelib files. Unfortuantly, gobject-introspection-1.0.pc