Pull back gobject-introspection from @tom-pratt's PR, enable building on RG353P/RG503.
This commit is contained in:
parent
e00826b5f7
commit
6f62ebc7b9
2 changed files with 16 additions and 15 deletions
|
@ -18,7 +18,9 @@ PKG_LONGDESC="GLib is a library which includes support routines for C such as li
|
|||
PKG_TOOLCHAIN="meson"
|
||||
|
||||
pre_configure_host() {
|
||||
PKG_MESON_OPTS_HOST="-Ddoctool=disabled"
|
||||
PKG_MESON_OPTS_HOST=" \
|
||||
-Ddoctool=disabled \
|
||||
-Dbuild_introspection_data=false"
|
||||
|
||||
# prevent g-ir-scanner from writing cache data to $HOME
|
||||
export GI_SCANNER_DISABLE_CACHE="1"
|
||||
|
@ -40,18 +42,12 @@ pre_configure_target() {
|
|||
CFLAGS="${TARGET_CFLAGS}"
|
||||
LDFLAGS="${TARGET_LDFLAGS}"
|
||||
|
||||
case ${ARCH} in
|
||||
arm|aarch64)
|
||||
PKG_MESON_OPTS_TARGET+=" \
|
||||
-Dgi_cross_use_prebuilt_gi=true \
|
||||
-Dgi_cross_binary_wrapper=${TOOLCHAIN}/bin/g-ir-scanner-binary-wrapper \
|
||||
-Dgi_cross_ldd_wrapper=${TOOLCHAIN}/bin/g-ir-scanner-ldd-wrapper"
|
||||
;;
|
||||
esac
|
||||
|
||||
PKG_MESON_OPTS_TARGET+=" \
|
||||
PKG_MESON_OPTS_TARGET=" \
|
||||
-Ddoctool=disabled \
|
||||
-Dpython=${TOOLCHAIN}/bin/${PKG_PYTHON_VERSION} \
|
||||
-Dgi_cross_use_prebuilt_gi=true \
|
||||
-Dgi_cross_binary_wrapper=${TOOLCHAIN}/bin/g-ir-scanner-binary-wrapper \
|
||||
-Dgi_cross_ldd_wrapper=${TOOLCHAIN}/bin/g-ir-scanner-ldd-wrapper \
|
||||
-Dbuild_introspection_data=true"
|
||||
|
||||
# prevent g-ir-scanner from writing cache data to $HOME
|
||||
|
|
|
@ -32,6 +32,8 @@ PKG_SOFTWARE=""
|
|||
|
||||
PKG_COMPAT=""
|
||||
|
||||
PKG_MULTIMEDIA="ffmpeg mpv vlc"
|
||||
|
||||
PKG_TOOLS="i2c-tools rclone jslisten evtest tailscale"
|
||||
|
||||
### Tools for mainline devices
|
||||
|
@ -41,9 +43,12 @@ case "${DEVICE}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
PKG_MULTIMEDIA="ffmpeg mpv vlc"
|
||||
|
||||
PKG_EXPERIMENTAL=""
|
||||
### Bluetooth support for some devices
|
||||
case "${DEVICE}" in
|
||||
RG503|RG353P)
|
||||
PKG_TOOLS+=" pygobject"
|
||||
;;
|
||||
esac
|
||||
|
||||
### Project specific variables
|
||||
case "${PROJECT}" in
|
||||
|
@ -60,7 +65,7 @@ if [ ! -z "${BASE_ONLY}" ]
|
|||
then
|
||||
PKG_DEPENDS_TARGET+=" ${PKG_BASEOS} ${PKG_TOOLS} ${PKG_UI}"
|
||||
else
|
||||
PKG_DEPENDS_TARGET+=" ${PKG_BASEOS} ${PKG_TOOLS} ${PKG_UI} ${PKG_COMPAT} ${PKG_MULTIMEDIA} ${PKG_SOFTWARE} ${PKG_EXPERIMENTAL}"
|
||||
PKG_DEPENDS_TARGET+=" ${PKG_BASEOS} ${PKG_TOOLS} ${PKG_UI} ${PKG_COMPAT} ${PKG_MULTIMEDIA} ${PKG_SOFTWARE}"
|
||||
fi
|
||||
|
||||
make_target() {
|
||||
|
|
Loading…
Reference in a new issue