summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-04-06 17:24:07 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-07 10:58:14 +0200
commitc9f9582753b9e0c4091af544a2be54ee2fdea70f (patch)
tree5d5885904a5e1e1e2c3607ccda2f90be6dc68469
parent6ba5773ca5d7b7299c0d02be5f4a143951bcb044 (diff)
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
-rwxr-xr-x.ci/ci-configure.sh5
-rw-r--r--.ci/zlib.pc13
2 files changed, 17 insertions, 1 deletions
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
94 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS" 94 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
95 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" 95 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
96 LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2) 96 LIBFFI_VER=$(brew list --versions libffi|head -n1|cut -d' ' -f2)
97 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig"
98 export CC="ccache gcc" 97 export CC="ccache gcc"
98 #force using system zlib, which doesn't have a pc file provided because that's the smartest thing possible
99 zlib_vers=$(grep ZLIB_VERSION /usr/include/zlib.h|head -n1|awk '{print $3}'|cut -d'"' -f2)
100 sed -iE "s/REPLACE_THIS/$zlib_vers/" .ci/zlib.pc
101 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
99 travis_fold meson meson 102 travis_fold meson meson
100 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 103 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
101 travis_endfold meson 104 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 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib64
4sharedlibdir=${libdir}
5includedir=/usr/include
6
7Name: zlib
8Description: zlib compression library
9Version: REPLACE_THIS
10
11Requires:
12Libs: -L${libdir} -L${sharedlibdir} -lz
13Cflags: -I${includedir}