diff --git a/build-package.sh b/build-package.sh index d8940f6c00..7912385750 100755 --- a/build-package.sh +++ b/build-package.sh @@ -80,6 +80,10 @@ source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_setup_cgct_environment.sh" # shellcheck source=scripts/build/setup/termux_setup_cargo_c.sh source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_cargo_c.sh" +# Utility function for setting up pkg-config wrapper. +# shellcheck source=scripts/build/setup/termux_setup_pkg_config_wrapper.sh +source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_pkg_config_wrapper.sh" + # Utility function for setting up Crystal toolchain. # shellcheck source=scripts/build/setup/termux_setup_crystal.sh source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_crystal.sh" diff --git a/disabled-packages/libdazzle/build.sh b/disabled-packages/libdazzle/build.sh index b3a86b3abf..4a15ea4dcf 100644 --- a/disabled-packages/libdazzle/build.sh +++ b/disabled-packages/libdazzle/build.sh @@ -18,15 +18,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" termux_step_pre_configure() { termux_setup_gir - - local _WRAPPER_BIN="${TERMUX_PKG_BUILDDIR}/_wrapper/bin" - mkdir -p "${_WRAPPER_BIN}" - if [[ "${TERMUX_ON_DEVICE_BUILD}" == "false" ]]; then - sed "s|^export PKG_CONFIG_LIBDIR=|export PKG_CONFIG_LIBDIR=${TERMUX_PREFIX}/opt/glib/cross/lib/x86_64-linux-gnu/pkgconfig:|" \ - "${TERMUX_STANDALONE_TOOLCHAIN}/bin/pkg-config" \ - > "${_WRAPPER_BIN}/pkg-config" - chmod +x "${_WRAPPER_BIN}/pkg-config" - export PKG_CONFIG="${_WRAPPER_BIN}/pkg-config" - fi - export PATH="${_WRAPPER_BIN}:${PATH}" + termux_setup_glib_cross_pkg_config_wrapper } diff --git a/disabled-packages/libhandy-0.0/build.sh b/disabled-packages/libhandy-0.0/build.sh index 39fe2e8088..0195ecc443 100644 --- a/disabled-packages/libhandy-0.0/build.sh +++ b/disabled-packages/libhandy-0.0/build.sh @@ -19,17 +19,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" termux_step_pre_configure() { termux_setup_gir - - local _WRAPPER_BIN="${TERMUX_PKG_BUILDDIR}/_wrapper/bin" - mkdir -p "${_WRAPPER_BIN}" - if [[ "${TERMUX_ON_DEVICE_BUILD}" == "false" ]]; then - sed "s|^export PKG_CONFIG_LIBDIR=|export PKG_CONFIG_LIBDIR=${TERMUX_PREFIX}/opt/glib/cross/lib/x86_64-linux-gnu/pkgconfig:|" \ - "${TERMUX_STANDALONE_TOOLCHAIN}/bin/pkg-config" \ - > "${_WRAPPER_BIN}/pkg-config" - chmod +x "${_WRAPPER_BIN}/pkg-config" - export PKG_CONFIG="${_WRAPPER_BIN}/pkg-config" - fi - export PATH="${_WRAPPER_BIN}:${PATH}" + termux_setup_glib_cross_pkg_config_wrapper } termux_step_post_massage() { diff --git a/scripts/build/setup/termux_setup_pkg_config_wrapper.sh b/scripts/build/setup/termux_setup_pkg_config_wrapper.sh new file mode 100644 index 0000000000..5c9a12e8f2 --- /dev/null +++ b/scripts/build/setup/termux_setup_pkg_config_wrapper.sh @@ -0,0 +1,21 @@ +termux_setup_pkg_config_wrapper() { + local _PKG_CONFIG_LIBDIR=$1 + local _WRAPPER_BIN="${TERMUX_PKG_BUILDDIR}/_wrapper/bin" + mkdir -p "${_WRAPPER_BIN}" + if [[ "${TERMUX_ON_DEVICE_BUILD}" == "false" ]]; then + sed "s|^export PKG_CONFIG_LIBDIR=|export PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR}:|" \ + "${TERMUX_STANDALONE_TOOLCHAIN}/bin/pkg-config" \ + > "${_WRAPPER_BIN}/pkg-config" + chmod +x "${_WRAPPER_BIN}/pkg-config" + export PKG_CONFIG="${_WRAPPER_BIN}/pkg-config" + fi + export PATH="${_WRAPPER_BIN}:${PATH}" +} + +termux_setup_glib_cross_pkg_config_wrapper() { + termux_setup_pkg_config_wrapper "${TERMUX_PREFIX}/opt/glib/cross/lib/x86_64-linux-gnu/pkgconfig" +} + +termux_setup_wayland_cross_pkg_config_wrapper() { + termux_setup_wayland_cross_pkg_config_wrapper +}