mirror of
https://git.suyu.dev/suyu/Yucom.git
synced 2025-12-21 21:26:03 +01:00
Build most of the fonts in the container.
We can move everything but Liberation fonts build to the container. Sadly those require newer version of fontforge than the one available in the Steam RT. There's some extra logic necessary to assure that font build triggers in the container with the default/all targets. This removes the requirement to have afdko and fonttools installed on the host.
This commit is contained in:
parent
701dad161f
commit
76406455ac
2 changed files with 22 additions and 37 deletions
18
configure.sh
18
configure.sh
|
|
@ -46,18 +46,6 @@ dependency_command() {
|
|||
fi
|
||||
}
|
||||
|
||||
dependency_afdko() {
|
||||
if command -v makeotf &> /dev/null; then
|
||||
AFDKO_VERB=
|
||||
elif command -v afdko &> /dev/null; then
|
||||
AFDKO_VERB=afdko
|
||||
else
|
||||
err "Couldn't find 'afdko'. Install it and make sure that 'makeotf' is in your PATH or 'afdko makeotf' works."
|
||||
err "Some distributions don't package afdko correctly, you may need to 'pip install afdko'."
|
||||
MISSING_DEPENDENCIES=1
|
||||
fi
|
||||
}
|
||||
|
||||
CONTAINER_MOUNT_OPTS=""
|
||||
|
||||
check_container_engine() {
|
||||
|
|
@ -130,8 +118,6 @@ function configure() {
|
|||
dependency_command git
|
||||
dependency_command python3
|
||||
|
||||
dependency_afdko
|
||||
|
||||
if [ "$MISSING_DEPENDENCIES" -ne 0 ]; then
|
||||
die "Missing dependencies, cannot continue."
|
||||
fi
|
||||
|
|
@ -182,8 +168,6 @@ function configure() {
|
|||
echo "ENABLE_CCACHE := 1"
|
||||
fi
|
||||
|
||||
echo "AFDKO_VERB := $AFDKO_VERB"
|
||||
|
||||
# Include base
|
||||
echo ""
|
||||
echo "include \$(SRCDIR)/Makefile.in"
|
||||
|
|
@ -198,7 +182,7 @@ function configure() {
|
|||
#
|
||||
|
||||
arg_steamrt="soldier"
|
||||
arg_protonsdk_image="registry.gitlab.steamos.cloud/proton/soldier/sdk:0.20211207.0-1"
|
||||
arg_protonsdk_image="registry.gitlab.steamos.cloud/proton/soldier/sdk:0.20220119.0-1"
|
||||
arg_no_protonsdk=""
|
||||
arg_build_name=""
|
||||
arg_container_engine=""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue