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
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'freetype'
|
||||
pkgname=freetype
|
||||
version=2.10.4
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-freetype-config"
|
||||
hostmakedepends="pkg-config"
|
||||
|
@ -13,6 +13,10 @@ homepage="https://www.freetype.org/"
|
|||
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
||||
checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
|
||||
|
||||
post_patch() {
|
||||
vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vlicense docs/LICENSE.TXT
|
||||
vlicense docs/FTL.TXT
|
||||
|
|
Loading…
Reference in a new issue