summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-13 13:48:24 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2019-02-14 13:00:58 +0100
commit7ab9b48151e42b23e2fd10f58c463b18dbc7ef5a (patch)
treed74e2a808ad4b62152fc7140bea9c940696cb56c
parentac6061057355c21cb8d48bd6517344923dde7681 (diff)
build: enable eolian_gen bootstrapping for cross compile
this enables travis to build eolian_gen before cross compiling in mingw. This is done in order to make eolian_gen patches easier on CI. Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D7930
-rwxr-xr-x.ci/bootstrap_eolian.sh7
-rwxr-xr-x.ci/ci-configure.sh3
2 files changed, 9 insertions, 1 deletions
diff --git a/.ci/bootstrap_eolian.sh b/.ci/bootstrap_eolian.sh
new file mode 100755
index 0000000000..3e2734e714
--- /dev/null
+++ b/.ci/bootstrap_eolian.sh
@@ -0,0 +1,7 @@
1#!/bin/sh
2
3mkdir build-eolian-bootstrap
4meson --prefix=/usr/ --libdir=/usr/lib -Deolian-bootstrap=true build-eolian-bootstrap
5ninja -C build-eolian-bootstrap install
6rm -rf build-eolian-bootstrap
7ldconfig
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 3f35c9e969..b2a7a03f26 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -77,7 +77,7 @@ else
77 77
78 RELEASE_READY_LINUX_COPTS=" --with-profile=release" 78 RELEASE_READY_LINUX_COPTS=" --with-profile=release"
79 79
80 MINGW_COPTS=" --prefix=/ewpi-64-install --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/local/bin/eolian_gen \ 80 MINGW_COPTS=" --prefix=/ewpi-64-install --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
81 --with-edje-cc=/usr/local/bin/edje_cc --with-eet-eet=/usr/local/bin/eet \ 81 --with-edje-cc=/usr/local/bin/edje_cc --with-eet-eet=/usr/local/bin/eet \
82 --with-bin-elm-prefs-cc=/usr/local/bin/elm_prefs_cc \ 82 --with-bin-elm-prefs-cc=/usr/local/bin/elm_prefs_cc \
83 --disable-static --with-tests=regular --with-crypto=openssl \ 83 --disable-static --with-tests=regular --with-crypto=openssl \
@@ -110,6 +110,7 @@ else
110 if [ "$1" = "mingw" ]; then 110 if [ "$1" = "mingw" ]; then
111 OPTS="$OPTS $MINGW_COPTS" 111 OPTS="$OPTS $MINGW_COPTS"
112 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache' 112 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
113 docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap_eolian.sh'
113 fi 114 fi
114 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf' 115 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
115 travis_fold autoreconf autoreconf 116 travis_fold autoreconf autoreconf