updated .travis.yml to revert the previous changes and defined CPPFLAGS as a separte item in env for macosx
This commit is contained in:
parent
516c9db295
commit
dade5f563b
36
.travis.yml
36
.travis.yml
@ -10,28 +10,28 @@ compiler:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
matrix:
|
matrix:
|
||||||
- OPTIONS=(--enable-static=yes --enable-shared=no --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=yes --enable-shared=no --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=yes --enable-shared=no --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=yes --enable-shared=no --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=no --enable-shared=yes --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=no --enable-shared=yes --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=no --enable-shared=yes --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=no --enable-shared=yes --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=yes --enable-shared=no --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=yes --enable-shared=no --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=yes --enable-shared=no --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=yes --enable-shared=no --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=no --enable-shared=yes --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=no --enable-shared=yes --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=no --enable-shared=yes --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=no --enable-shared=yes --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=yes --enable-shared=no --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=yes --enable-shared=no --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=yes --enable-shared=no --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=yes --enable-shared=no --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=no --enable-shared=yes --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=no --enable-shared=yes --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=no --enable-shared=yes --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=no --enable-shared=yes --enable-debug=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=yes --enable-shared=no --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=yes --enable-shared=no --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=yes --enable-shared=no --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=yes --enable-shared=no --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=no --enable-shared=yes --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=no --enable-shared=yes --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
- OPTIONS=(--enable-static=no --enable-shared=yes --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes)
|
- OPTIONS="--enable-static=no --enable-shared=yes --enable-debug=yes --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:4 --enable-intmax=no --enable-fltmax=no --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes"
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: osx
|
- os: osx
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: OPTIONS=(--enable-static=yes --enable-shared=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes CPPFLAGS="-D__BEGIN_DECLS -D__END_DECLS")
|
env: OPTIONS="--enable-static=yes --enable-shared=no --enable-dynamic-module=yes --enable-static-module=yes --enable-wide-char=yes:2 --enable-intmax=yes --enable-fltmax=yes --enable-mod-mysql=no --enable-mod-uci=no --enable-cxx=yes --enable-pthread-flags=yes" CPPFLAGS="-D__BEGIN_DECLS -D__END_DECLS""
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- touch -r hawk/configure hawk/* hawk/*/* && cd hawk && ./configure "${OPTIONS[@]}" && make && make check && make distcheck
|
- touch -r hawk/configure hawk/* hawk/*/* && cd hawk && ./configure $OPTIONS && make && make check && make distcheck
|
||||||
|
Loading…
Reference in New Issue
Block a user