Skip to content
Snippets Groups Projects
Commit 9c87898e authored by Yaroslav Lobankov's avatar Yaroslav Lobankov Committed by Yaroslav Lobankov
Browse files

ci: add missing deps to make targets for OSX

This patch fixes the following error on OSX systems:

    autoreconf: error: aclocal failed with exit status: 2
    make[3]: *** [build/curl/work/stamp/bundled-libcurl-project-configure]
        Error 2
    make[2]: *** [CMakeFiles/bundled-libcurl-project.dir/all] Error 2
    make[2]: *** Waiting for unfinished jobs....

To resolve this issue we need to install the `autoconf`, `automake`,
and `libtool` packages before tarantool build.

NO_DOC=ci
NO_TEST=ci
NO_CHANGELOG=ci
parent cb29314d
No related branches found
No related tags found
No related merge requests found
......@@ -358,7 +358,7 @@ test_odroid_arm64: deps_odroid_arm64 test_odroid_arm64_no_deps
# FIXME: Temporary pinned python3 to specific version (i.e. python@3.8) to
# avoid gevent package installation failure described in gevent/gevent#1721.
# Revert this back when the issue is resolved.
OSX_PKGS=openssl readline curl icu4c libiconv zlib cmake python@3.8
OSX_PKGS=openssl readline curl icu4c libiconv zlib cmake python@3.8 autoconf automake libtool
deps_osx:
# install brew using command from Homebrew repository instructions:
......@@ -521,9 +521,9 @@ luajit_Linux_x86_64_test: tarantool_linux_tests
tarantool_darwin_deps:
${ARCH} brew install --force openssl readline curl icu4c libiconv zlib \
cmake python@3.8 \
cmake python@3.8 autoconf automake libtool \
|| ${ARCH} brew upgrade openssl readline curl icu4c libiconv zlib \
cmake python@3.8
cmake python@3.8 autoconf automake libtool
${ARCH} pip3 install --force-reinstall -r test-run/requirements.txt
tarantool_darwin_prebuild:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment