Fix travis macos+scons build.

Steps:
1) added `brew install libffi`, was told it was already installed and to try reinstalling.
2) changed to `brew reinstall libffi`, was told it was "keg only" and was provided the PKG_CONFIG export statement.
3) added export statement, seems to work.
This commit is contained in:
Pentarctagon 2019-03-15 04:08:25 -05:00
parent 6bb78d4f65
commit 426aa7318a
2 changed files with 3 additions and 0 deletions

View file

@ -6,6 +6,7 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
brew update
brew install scons cairo pango moreutils sdl2_image sdl2_ttf sdl2_mixer
brew reinstall libffi
else

View file

@ -24,6 +24,8 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
./utils/travis/check_utf8.sh
./utils/travis/utf8_bom_dog.sh
"$CXX" --version
export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig"
scons wesnoth wesnothd campaignd boost_unit_tests build=release \
ctool="$CC" cxxtool="$CXX" cxx_std="$CXXSTD" \
extra_flags_config="-pipe" extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=true \