From 4147b42afd9731a5987a03e42ac04f72c44fc172 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 28 Jun 2019 01:40:49 +0200 Subject: [PATCH 1/2] ci: Update homebrew on macOS before installing packages --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1ccd30b612..f92176d9f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ addons: - libsdl2-dev - libepoxy-dev homebrew: + update: true packages: - glib - pixman From e8680193c69f20ab04ebe12f5005ec68ac10d773 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 28 Jun 2019 02:11:18 +0200 Subject: [PATCH 2/2] build.sh: Fix macOS; add path to libffi pkgconfig to PKG_CONFIG_PATH --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index fa49295dee..0e8d911ebd 100755 --- a/build.sh +++ b/build.sh @@ -48,6 +48,8 @@ case "$(uname -s)" in # adjust compilation option based on platform echo 'Compiling for MacOS…' sys_cflags='-march=native' sys_opts='--disable-cocoa' + # necessary to find libffi, which is required by gobject + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}/usr/local/opt/libffi/lib/pkgconfig" ;; CYGWIN*|MINGW*|MSYS*) echo 'Compiling for Windows…'