better method for handling rolling releases [ci skip]

This commit is contained in:
filux 2015-12-14 01:55:38 +01:00
parent 19df221af2
commit 66ad196b74
1 changed files with 9 additions and 9 deletions

View File

@ -145,11 +145,15 @@ detect_system
echo 'We have detected the following system:' echo 'We have detected the following system:'
echo ' [ '"$distribution"' ] [ '"$release"' ] [ '"$codename"' ] [ '"$architecture"' ]' echo ' [ '"$distribution"' ] [ '"$release"' ] [ '"$codename"' ] [ '"$architecture"' ]'
if [ "$release" = "rolling" ] && [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then
echo 'Turning ON dynamic LIBS ...'
WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=OFF"
fi
if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FONTCONFIG=OFF" EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FONTCONFIG=OFF"
fi fi
if [ "$release" != "rolling" ]; then
case $distribution in case $distribution in
Debian) Debian)
case $release in case $release in
@ -207,16 +211,12 @@ case $distribution in
;; ;;
Arch) Arch)
echo 'Turning ON dynamic LIBS ...' if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then
WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=OFF" echo 'Turning ON dynamic LIBS ...'
WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=OFF"
fi
;; ;;
esac esac
else
echo 'Turning ON dynamic LIBS ...'
WANT_STATIC_LIBS="-DWANT_STATIC_LIBS=OFF"
fi
#exit 1;
# If, in the configuration section on top of this script, the user has # If, in the configuration section on top of this script, the user has
# indicated they want to use clang in favor of the default of GCC, use clang. # indicated they want to use clang in favor of the default of GCC, use clang.