diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-12 10:33:31 -0400 |
|---|---|---|
| committer | Stefan Schmidt <s.schmidt@samsung.com> | 2019-03-12 16:18:22 +0100 |
| commit | bf26ce4b12a1fdd6e8dbda1db625789a5456bd23 (patch) | |
| tree | 9799ce0d0a94f8408b4246631380b3985dfaea93 | |
| parent | d7beb192daaa10ef07837214371821e5109ed74b (diff) | |
| download | efl-bf26ce4b12a1fdd6e8dbda1db625789a5456bd23.tar.gz | |
ci: force osx libffi dep to be found
this is really, really stupid.
Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org>
Differential Revision: https://phab.enlightenment.org/D8305
| -rwxr-xr-x | .ci/ci-configure.sh | 3 | ||||
| -rwxr-xr-x | .ci/ci-osx-deps.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index df52625761..dc50f44533 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -44,7 +44,8 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS" export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" - export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig" + LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2) + export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig" mkdir build && meson build -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Dbindings=luajit -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine fi else diff --git a/.ci/ci-osx-deps.sh b/.ci/ci-osx-deps.sh index 22672606e8..838dd2dc05 100755 --- a/.ci/ci-osx-deps.sh +++ b/.ci/ci-osx-deps.sh @@ -2,5 +2,5 @@ brew update brew unlink python -brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 pulseaudio ccache ninja python3 +brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 pulseaudio ccache ninja python3 libffi pip3 install meson |