diff --git a/.travis.yml b/.travis.yml index a3ec56336..a4a8da48a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: script: - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$BUILD_PL" == true ]]; then ./package/linux/travis-build-main.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$BUILD_PL" == false ]]; then ./package/linux/travis-build-cpp.sh; fi - - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$BUILD_PL" == true ]]; then ./package/osx/travis-build-main.sh; fi + - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$BUILD_PL" == true ]]; then travis_wait 60 ./package/osx/travis-build-main.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$BUILD_PL" == false ]]; then ./package/osx/travis-build-cpp.sh; fi branches: diff --git a/package/osx/travis-build-main.sh b/package/osx/travis-build-main.sh index 69b6bbb63..51df043d9 100755 --- a/package/osx/travis-build-main.sh +++ b/package/osx/travis-build-main.sh @@ -15,7 +15,7 @@ if !(perl -MWx -e1 2> /dev/null); then CXX="clang++ -mmacosx-version-min=10.12" \ CPPFLAGS="-mmacosx-version-min=10.12 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" \ LDFLAGS="-mmacosx-version-min=10.12" \ - travis_wait 60 cpanm --local-lib local-lib Alien::wxWidgets --reinstall \ + cpanm --local-lib local-lib Alien::wxWidgets --reinstall \ --configure-args="--wxWidgets-build=1 --wxWidgets-extraflags=\"--with-macosx-version-min=10.12 --disable-qtkit --disable-mediactrl --disable-webkit --disable-webview\" --wxWidgets-userpatch=$(pwd)/package/osx/patch-wxwidgets.diff" PERL_USE_UNSAFE_INC=1 cpanm --local-lib local-lib --reinstall -v https://github.com/alranel/wxPerl-osx10.12/tarball/master