From c9f9582753b9e0c4091af544a2be54ee2fdea70f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 6 Apr 2020 17:24:07 -0400 Subject: [PATCH] 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 Differential Revision: https://phab.enlightenment.org/D11661 --- .ci/ci-configure.sh | 5 ++++- .ci/zlib.pc | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .ci/zlib.pc diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index 10730003e6..41e63ad24a 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -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 diff --git a/.ci/zlib.pc b/.ci/zlib.pc new file mode 100644 index 0000000000..e217860219 --- /dev/null +++ b/.ci/zlib.pc @@ -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}