mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-08 01:54:37 +02:00
Update cache on MacOS 10.15.
This commit is contained in:
parent
47937245a6
commit
baf625e1ba
|
@ -785,7 +785,7 @@ for:
|
||||||
|
|
||||||
sudo ln -s /usr/local /opt/local;
|
sudo ln -s /usr/local /opt/local;
|
||||||
|
|
||||||
cache_tag=usr_local_2 # this can be modified to rebuild deps
|
cache_tag=usr_local_3 # this can be modified to rebuild deps
|
||||||
|
|
||||||
cdir=$HOME/cache_dir
|
cdir=$HOME/cache_dir
|
||||||
cache_tar=$cdir/$cache_tag.tar
|
cache_tar=$cdir/$cache_tag.tar
|
||||||
|
@ -839,11 +839,6 @@ for:
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
- qbs --version
|
- qbs --version
|
||||||
# Patch Qbs. Remove after Qbs 2.2.1+.
|
|
||||||
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
|
||||||
- patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch || true
|
|
||||||
- rm -f $(brew --prefix qbs)/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js.rej
|
|
||||||
- rm $HOME/qbs-pkg-config-probe.patch
|
|
||||||
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
||||||
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
||||||
- cmake ${HOME}/macdeployqt-main -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
- cmake ${HOME}/macdeployqt-main -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
||||||
|
|
Loading…
Reference in a new issue