[EGIT] [core/efl] master 02/03: ci: mingw: enable various build options with dependencies now satisfied

[Stefan Schmidt]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6206e7e944b60cd3fd4a8e655cedc77146e9653d

commit 6206e7e944b60cd3fd4a8e655cedc77146e9653d
Author: Stefan Schmidt <***@samsung.com>
Date: Wed Nov 28 10:52:42 2018 +0100

ci: mingw: enable various build options with dependencies now satisfied

After some fixes and updates in ewpi we now have gstreamer, libtiff and
bullet ready as cross compiled dependencies. Time to enable them in the
build.

Reviewed-by: Marcel Hollerbach <marcel-***@t-online.de>
Differential Revision: https://phab.enlightenment.org/D7378
---
.ci/ci-configure.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 3e398bd057..b2a62b5736 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -76,10 +76,9 @@ else
MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/local/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 --disable-gstreamer1 \
+ --disable-static --with-tests=regular --with-crypto=openssl \
--disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
- --disable-librsvg --disable-pulseaudio --disable-cxx-bindings \
- --disable-physics --disable-image-loader-tiff"
+ --disable-librsvg --disable-pulseaudio --disable-cxx-bindings"

patch -p1 < .ci/efl.m4.diff
sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac

--

[Stefan Schmidt]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8e9f773f04f19dc856c326309aaa99de734f4a6f

commit 8e9f773f04f19dc856c326309aaa99de734f4a6f
Author: Stefan Schmidt <***@samsung.com>
Date: Wed Nov 28 10:49:05 2018 +0100

travis: re-enable mingw build with newer eolian_gen for bootstrap

The docker image now contains a native efl build as bootstrap for doing
the mingw cross-build. Paths to the generator binaries have been
update. We also switched to using a dedicated Fedora28-mingw docker
image for now to have a more stable environment for now.

Reviewed-by: Marcel Hollerbach <marcel-***@t-online.de>
Differential Revision: https://phab.enlightenment.org/D7377
---
.ci/ci-configure.sh | 5 +++--
.travis.yml | 9 ++++-----
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index bd434d33c7..3e398bd057 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -73,8 +73,9 @@ else

RELEASE_READY_LINUX_COPTS=" --with-profile=release"

- MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
- --with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \
+ MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/local/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 --disable-gstreamer1 \
--disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
--disable-librsvg --disable-pulseaudio --disable-cxx-bindings \
diff --git a/.travis.yml b/.travis.yml
index 35f6e15cba..7974cf5f38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,10 @@ env:

jobs:
include:
+ - env:
+ - os: linux
+ - DISTRO=Fedora28-mingw
+ - CI_BUILD_TYPE=mingw
- env:
- os: linux
- DISTRO=Fedora28
@@ -70,11 +74,6 @@ jobs:
exclude:
- os: linux

-# - env:
-# - os: linux
-# - DISTRO=Fedora28
-# - CI_BUILD_TYPE=mingw
-
services:
- docker


--

[Stefan Schmidt]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4aeb3e20c95c53b9a856a9269d691cbc275839a4

commit 4aeb3e20c95c53b9a856a9269d691cbc275839a4
Author: Stefan Schmidt <***@samsung.com>
Date: Fri Dec 7 11:14:46 2018 +0100

autotools: evil: add needed -lmsvcr100 library flag for _create/_free_locale()

Since commit 33b8e5157a25b73a0729055ecd22b17e97781e11 we need these two
new symbols on our windows cross build. At least on my mingw system they
are not showing up by default and I need to ensure we are linking
against msvcr100 to get them or I get undefined references during
linking.

Reviewed-by: Marcel Hollerbach <marcel-***@t-online.de>
Differential Revision: https://phab.enlightenment.org/D7428
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4467f0072d..576a1afc71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -804,7 +804,7 @@ EFL_SELECT_WINDOWS_VERSION

### Checks for libraries

-EFL_ADD_LIBS([EVIL], [-lpsapi -lole32 -lws2_32 -lsecur32 -luuid])
+EFL_ADD_LIBS([EVIL], [-lpsapi -lole32 -lws2_32 -lsecur32 -luuid -lmsvcr100])

### Checks for header files


--