From 92ab04ac8a64f224435a8d7af8a84e0e12aafdf5 Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Mon, 24 Oct 2022 14:05:47 -0300 Subject: [PATCH] Upgrade bison to v2.7 for macOS builds on Travis-ci [skip AppVeyor] This is the minimum change to be able to use %destructor in DataFilter.y, the same version is used for Windows builds. --- travis/osx/before_install.sh | 3 +++ travis/osx/before_script.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh index fd861e8d9..5d57973ed 100755 --- a/travis/osx/before_install.sh +++ b/travis/osx/before_install.sh @@ -19,6 +19,9 @@ rm -rf '/usr/local/include/c++' ## brew install --HEAD travis/libkml.rb sudo chmod -R +w /usr/local +brew update +brew install bison@2.7 + # GSL - install from source due to homebrew issues curl -k -O https://ftp.gnu.org/gnu/gsl/gsl-2.6.tar.gz tar xf gsl-2.6.tar.gz diff --git a/travis/osx/before_script.sh b/travis/osx/before_script.sh index 809f73711..8c4dd5a4d 100755 --- a/travis/osx/before_script.sh +++ b/travis/osx/before_script.sh @@ -24,6 +24,8 @@ cd .. cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri +# Bison +echo QMAKE_YACC=/usr/local/opt/bison@2.7/bin/bison >> src/gcconfig.pri # Define GC version string, only for tagged builds if [ -n "$TRAVIS_TAG" ]; then echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri; fi sed -i "" "s|#\(CONFIG += release.*\)|\1 static |" src/gcconfig.pri