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.

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

BUILD: Prefer pkg-config to freetype-config v2 #1267

Merged
merged 5 commits into from Aug 4, 2018

Conversation

Projects
None yet
3 participants
@bgK
Member

bgK commented Jul 31, 2018

This pull request includes the changes from #1185 to use pkg-config if it is available when buillding with FreeType support. This is necessary because FreeType stopped shipping the freetype-config script starting from version 2.9.1.

In addition to the changes in #1185, this adds some quality of life improvements:

  • Check that pkg-config is available before using it
  • Warn when cross-compiling and the PKG_CONFIG_LIBDIR environment variable is not set, because pkg-config would use the host package description files instead of the ones for the target system
  • Save and restore the PKG_CONFIG_LIBDIR environment variable value across automatic re-runs of configure
  • Include the changes from #1128 to allow to overriding more tools using environment variables. This allows using most of snover's wonderful Docker images (https://hub.docker.com/u/scummvm/) to easily produce cross-compiled builds

This requires that PKG_CONFIG_LIBDIR is properly set when doing cross compilation. The buildbot configuration already has been updated, but porters will need to be warned about the change and the documentation will need to be updated on the wiki.

csnover and others added some commits Oct 20, 2017

BUILD: Respect all build tool overrides from environment
Previously, only CXX could be overridden by the environment, which
made it impossible to correctly set tools for cross-compiler
toolchains which were not compatible with the default system tools.
BUILD: Prefer pkg-config over freetype-config if possible
As of freetype-2.9.1 the freetype-config script no longer gets installed
by default.

@bgK bgK merged commit 172cdab into scummvm:master Aug 4, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment