freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable * In a build that have both freetype-config and pkg-config, $XBPS_CROSS_BASE will be prepended twice with current system, let's fix it.
This commit is contained in:
parent
0c9b65dfbd
commit
6547bbb473
2 changed files with 19 additions and 2 deletions
|
@ -175,6 +175,13 @@ install_cross_wrappers() {
|
|||
done
|
||||
}
|
||||
|
||||
link_wrapper() {
|
||||
local wrapper="$1"
|
||||
[ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
|
||||
[ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
|
||||
ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
|
||||
}
|
||||
|
||||
hook() {
|
||||
export PATH="$XBPS_WRAPPERDIR:$PATH"
|
||||
|
||||
|
@ -186,9 +193,15 @@ hook() {
|
|||
pkgconfig_wrapper
|
||||
vapigen_wrapper
|
||||
valac_wrapper
|
||||
|
||||
if [ -x /usr/bin/pkg-config ]; then
|
||||
link_wrapper freetype-config
|
||||
else
|
||||
generic_wrapper freetype-config
|
||||
fi
|
||||
|
||||
generic_wrapper icu-config
|
||||
generic_wrapper libgcrypt-config
|
||||
generic_wrapper freetype-config
|
||||
generic_wrapper sdl-config
|
||||
generic_wrapper sdl2-config
|
||||
generic_wrapper gpgme-config
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue