aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-13 13:48:24 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-13 15:45:15 +0100
commit3831bc89d47ffe2de3a288091923e7bcc87ab856 (patch)
treef1807420441674b5c8d5d0d7d41f3ee0cf09ad5f
parentbuild: add a option to bootstrap eolian (diff)
downloadefl-devs/bu5hm4n/eolian-bootstrap.tar.gz
build: enable eolian_gen bootstrapping for cross compiledevs/bu5hm4n/eolian-bootstrap
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.
-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 @@
+#!/bin/sh
+
+mkdir build-eolian-bootstrap
+meson --prefix=/usr/ --libdir=/usr/lib -Deolian-bootstrap=true build-eolian-bootstrap
+ninja -C build-eolian-bootstrap install
+rm -rf build-eolian-bootstrap
+ldconfig
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
RELEASE_READY_LINUX_COPTS=" --with-profile=release"
- MINGW_COPTS=" --prefix=/ewpi-64-install --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/local/bin/eolian_gen \
+ MINGW_COPTS=" --prefix=/ewpi-64-install --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
--with-edje-cc=/usr/local/bin/edje_cc --with-eet-eet=/usr/local/bin/eet \
--with-bin-elm-prefs-cc=/usr/local/bin/elm_prefs_cc \
--disable-static --with-tests=regular --with-crypto=openssl \
@@ -110,6 +110,7 @@ else
if [ "$1" = "mingw" ]; then
OPTS="$OPTS $MINGW_COPTS"
docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
+ docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap_eolian.sh'
fi
docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
travis_fold autoreconf autoreconf