ci: force system zlib on osx

osx doesn't ship a pkgconfig file for its own zlib, so now we're shipping
a pkgconfig file for their zlib to avoid future issues

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D11661
This commit is contained in:
Mike Blumenkrantz 2020-04-06 17:24:07 -04:00 committed by Marcel Hollerbach
parent 6ba5773ca5
commit c9f9582753
2 changed files with 17 additions and 1 deletions

View File

@ -94,8 +94,11 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
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"
export CC="ccache gcc"
#force using system zlib, which doesn't have a pc file provided because that's the smartest thing possible
zlib_vers=$(grep ZLIB_VERSION /usr/include/zlib.h|head -n1|awk '{print $3}'|cut -d'"' -f2)
sed -iE "s/REPLACE_THIS/$zlib_vers/" .ci/zlib.pc
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
travis_fold meson meson
mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Dgstreamer=false
travis_endfold meson

13
.ci/zlib.pc Normal file
View File

@ -0,0 +1,13 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
sharedlibdir=${libdir}
includedir=/usr/include
Name: zlib
Description: zlib compression library
Version: REPLACE_THIS
Requires:
Libs: -L${libdir} -L${sharedlibdir} -lz
Cflags: -I${includedir}