Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Freetype: run bash autogen.sh before any ./configure commands #3523

Merged
merged 5 commits into from
Nov 8, 2023
Merged

Freetype: run bash autogen.sh before any ./configure commands #3523

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20a13d5
move autogen command before libpng check
Haroon-Khel Nov 6, 2023
514b577
debug
Haroon-Khel Nov 6, 2023
7358c42
remove debug
Haroon-Khel Nov 7, 2023
9f9efba
exit if autogen fails
Haroon-Khel Nov 8, 2023
b058735
exit code 1
Haroon-Khel Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions sbin/prepareWorkspace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,19 +477,21 @@ checkingAndDownloadingFreeType() {
return
fi

local pngArg=""
if ./configure --help | grep "with-png"; then
pngArg="--with-png=no"
fi

local freetypeEnv=""
if [[ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "i686" ]] || [[ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "i386" ]]; then
freetypeEnv="export CC=\"gcc -m32\""
fi

eval "${freetypeEnv}" && bash ./autogen.sh
Haroon-Khel marked this conversation as resolved.
Show resolved Hide resolved

local pngArg=""
if ./configure --help | grep "with-png"; then
pngArg="--with-png=no"
fi

# We get the files we need at $WORKING_DIR/installedfreetype
# shellcheck disable=SC2046
if ! (eval "${freetypeEnv}" && bash ./autogen.sh && bash ./configure --prefix="${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}"/installedfreetype "${pngArg}" "${BUILD_CONFIG[FREETYPE_FONT_BUILD_TYPE_PARAM]}" && ${BUILD_CONFIG[MAKE_COMMAND_NAME]} all && ${BUILD_CONFIG[MAKE_COMMAND_NAME]} install); then
if ! (bash ./configure --prefix="${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}"/installedfreetype "${pngArg}" "${BUILD_CONFIG[FREETYPE_FONT_BUILD_TYPE_PARAM]}" && ${BUILD_CONFIG[MAKE_COMMAND_NAME]} all && ${BUILD_CONFIG[MAKE_COMMAND_NAME]} install); then
# shellcheck disable=SC2154
echo "Failed to configure and build libfreetype, exiting"
exit
Expand Down
Loading