summaryrefslogtreecommitdiff
path: root/.ci/ci-configure.sh
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-11-19 18:59:32 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-11-19 19:00:11 +0100
commitffb992cd4f32815a147d317d0785e2074f22e583 (patch)
treeb63edc02ab55f37fb312888307c87250d5f9dd57 /.ci/ci-configure.sh
parent1f709470c5d6d6754e0cf600dac5d4fa2a9e467d (diff)
Revert "ci: mingw build target to cross compile EFL for Windows"
This reverts commit 883058b92bf81784bf51f4cf97066e57367cc81c. This seems to bring up errors in the build -ldbus-1 cannot be found. Revisions is reopened.
Diffstat (limited to '.ci/ci-configure.sh')
-rwxr-xr-x.ci/ci-configure.sh37
1 files changed, 6 insertions, 31 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index e69cddc3c6..00f9e4b750 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -29,13 +29,6 @@ MISC_DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd -
29 29
30RELEASE_READY_LINUX_COPTS=" --with-profile=release" 30RELEASE_READY_LINUX_COPTS=" --with-profile=release"
31 31
32MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
33--with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \
34--disable-static --with-tests=regular --with-crypto=openssl --disable-gstreamer1 \
35--disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
36--disable-librsvg --disable-pulseaudio --disable-cxx-bindings \
37--disable-physics --disable-image-loader-tiff"
38
39patch -p1 < .ci/efl.m4.diff 32patch -p1 < .ci/efl.m4.diff
40sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac 33sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
41 34
@@ -58,34 +51,16 @@ if [ "$DISTRO" != "" ] ; then
58 if [ "$1" = "release-ready" ]; then 51 if [ "$1" = "release-ready" ]; then
59 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS" 52 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
60 fi 53 fi
61
62 if [ "$1" = "mingw" ]; then
63 OPTS="$OPTS $MINGW_COPTS"
64 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
65 fi
66 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf' 54 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
67 travis_fold autoreconf autoreconf 55 travis_fold autoreconf autoreconf
68 if [ "$1" = "mingw" ]; then 56 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
69 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache' 57 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
70 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \ 58 --env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv"
71 --env CPPFLAGS="-I/root/EFL/ewpi_64/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/root/EFL/ewpi_64/lib/" --env PKG_CONFIG_PATH="/root/EFL/ewpi_64/lib/pkgconfig/" \
72 $(cat $HOME/cid) sh -c "autoreconf -iv"
73 else
74 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
75 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
76 --env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv"
77 fi
78 travis_endfold autoreconf 59 travis_endfold autoreconf
79 travis_fold configure "configure $OPTS" 60 travis_fold configure "configure $OPTS"
80 if [ "$1" = "mingw" ]; then 61 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
81 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \ 62 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
82 --env CPPFLAGS="-I/root/EFL/ewpi_64/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/root/EFL/ewpi_64/lib/" --env PKG_CONFIG_PATH="/root/EFL/ewpi_64/lib/pkgconfig/" \ 63 --env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
83 $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
84 else
85 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
86 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
87 --env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
88 fi
89 travis_endfold configure 64 travis_endfold configure
90else 65else
91 OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C" 66 OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C"