mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
Build script: Qt has tagged versions currently
It looks like Qt company has LGPLed versions tagged wich simplifies things a bit while building, e.g. 5.15.3 current workaround matches "v5.15.3-lts-lgpl" tag. Background: Debian Sid is currently at Qt 5.15.8 which is impossible to build from scratch with current script as only a few git versions are tagged in the script format "v5.15.8". Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
parent
ce67c8b902
commit
5d708c0d92
1 changed files with 2 additions and 10 deletions
|
@ -293,16 +293,8 @@ if [ "$PLATFORM" = Linux ] && [[ $QT_VERSION == 5* ]] ; then
|
||||||
rm -rf "$INSTALL_ROOT"/include/QtLocation > /dev/null 2>&1
|
rm -rf "$INSTALL_ROOT"/include/QtLocation > /dev/null 2>&1
|
||||||
rm -rf "$INSTALL_ROOT"/include/QtPositioning > /dev/null 2>&1
|
rm -rf "$INSTALL_ROOT"/include/QtPositioning > /dev/null 2>&1
|
||||||
|
|
||||||
# thanks for nothing, Qt company...
|
git clone --branch "v$QT_VERSION" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT ||
|
||||||
# the forced open source releases apparently don't even deserve a tag in their repos
|
git clone --branch "v$QT_VERSION-lts-lgpl" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT
|
||||||
# so the correct SHA is extracted by looking at the qtlocation change introduced by
|
|
||||||
# the -lts-lgpl tag in https://code.qt.io/cgit/qt/qt5.git
|
|
||||||
if [ "$QT_VERSION" = "5.15.3" ] ; then
|
|
||||||
git clone https://code.qt.io/qt/qtlocation.git $QTLOC_GIT
|
|
||||||
git -C $QTLOC_GIT checkout 1bf01b84e30aab2b87a19184ce42160e6c92d8b
|
|
||||||
else
|
|
||||||
git clone --branch "v$QT_VERSION" https://code.qt.io/qt/qtlocation.git --depth=1 $QTLOC_GIT
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p "$QTLOC_PRIVATE"
|
mkdir -p "$QTLOC_PRIVATE"
|
||||||
cd $QTLOC_GIT/src/location
|
cd $QTLOC_GIT/src/location
|
||||||
|
|
Loading…
Reference in a new issue