fly/fgmeta
1
0
Fork 0
Code Activity

download_and_compile.sh: don't install OSG or plib packages if these are built

Browse source 
If the OSG component has been specified, don't attempt to install a
libopenscenegraph...-dev package from the distro. Ditto for the
libplib-dev package when the PLIB component has been specified.
This commit is contained in:
Florent Rougon 2020-11-16 21:24:07 +01:00
parent b11dab8c30
commit fa9550e5e7
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
download_and_compile.sh
View file

@ -585,13 +585,19 @@ function _installOrUpdateDistroPackages(){
if _elementIn "SIMGEAR" "${WHATTOBUILD[@]}" || \ if _elementIn "SIMGEAR" "${WHATTOBUILD[@]}" || \
_elementIn "FGFS" "${WHATTOBUILD[@]}"; then _elementIn "FGFS" "${WHATTOBUILD[@]}"; then
PKG+=(zlib1g-dev freeglut3-dev libglew-dev libopenal-dev libboost-dev) PKG+=(zlib1g-dev freeglut3-dev libglew-dev libopenal-dev libboost-dev)
_mandatory_pkg_alternative libopenscenegraph-3.4-dev libopenscenegraph-dev \
'libopenscenegraph-[0-9]+\.[0-9]+-dev' if ! _elementIn "OSG" "${WHATTOBUILD[@]}"; then
_mandatory_pkg_alternative libopenscenegraph-3.4-dev \
libopenscenegraph-dev 'libopenscenegraph-[0-9]+\.[0-9]+-dev'
fi
fi fi
# FlightGear # FlightGear
if _elementIn "FGFS" "${WHATTOBUILD[@]}"; then if _elementIn "FGFS" "${WHATTOBUILD[@]}"; then
PKG+=(libudev-dev libdbus-1-dev libplib-dev) PKG+=(libudev-dev libdbus-1-dev)
if ! _elementIn "PLIB" "${WHATTOBUILD[@]}"; then
PKG+=(libplib-dev)
fi
_mandatory_pkg_alternative libpng-dev libpng12-dev libpng16-dev _mandatory_pkg_alternative libpng-dev libpng12-dev libpng16-dev
# The following packages are needed for the built-in launcher # The following packages are needed for the built-in launcher
_optional_pkg_alternative qt5-default _optional_pkg_alternative qt5-default