summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-13 16:08:42 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2018-07-26 08:55:58 +0200
commitd568c6f1251048e0e3378beccbf9d915ce12fa28 (patch)
tree899269fb46de4c93e7fff85157e365a583577fcf /.ci
parent6652373897e3ca2c4d95e41b60aa903227947bc0 (diff)
ci: use manual autoreconf && configure calls
our autogen.sh stupidly destroys all the autotools cache files, so ensure that we keep them around to speed up configure Differential Revision: https://phab.enlightenment.org/D6615
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/ci-configure.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 146b9b6eb0..74f4848a2f 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -4,9 +4,6 @@ set -e
4 4
5CI_BUILD_TYPE="$1" 5CI_BUILD_TYPE="$1"
6 6
7export MAKEFLAGS="-j5"
8export EIO_MONITOR_POLL=1
9
10DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings -C" 7DEFAULT_LINUX_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings -C"
11 8
12WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \ 9WAYLAND_LINUX_COPTS=" --enable-wayland --enable-elput --enable-drm \
@@ -52,7 +49,7 @@ if [ "$DISTRO" != "" ] ; then
52 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf' 49 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
53 docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 50 docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
54 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 51 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
55 $(cat $HOME/cid) ./autogen.sh $OPTS 52 $(cat $HOME/cid) sh -c "autoreconf -iv && ./configure $OPTS"
56else 53else
57 OSX_COPTS="--disable-cxx-bindings --with-tests=regular -C" 54 OSX_COPTS="--disable-cxx-bindings --with-tests=regular -C"
58 55
@@ -68,5 +65,6 @@ else
68 65
69 # Normal build test of all targets 66 # Normal build test of all targets
70 rm -f ~/.ccache/ccache.conf 67 rm -f ~/.ccache/ccache.conf
71 ./autogen.sh $OSX_COPTS 68 autoreconf -iv
69 ./configure $OSX_COPTS
72fi 70fi