fixes for debian 7. add correct dependencies. add option to easily build harfbuzz
This commit is contained in:
parent
cbccc87677
commit
3b9d1ca4d8
2 changed files with 22 additions and 4 deletions
|
|
@ -776,6 +776,11 @@ if [ $1 ]; then
|
|||
build_gettext 0.18.3.1
|
||||
exit $?
|
||||
fi
|
||||
if [ $1 = "harfbuzz" ]; then
|
||||
# debian 7 lacks only harfbuzz
|
||||
build_harfbuzz 0.9.23 --with-glib=yes
|
||||
exit $?
|
||||
fi
|
||||
if [ $1 = "glib2" ]; then
|
||||
# such a huge build, put here by itself
|
||||
build_pkgconfig 0.28
|
||||
|
|
|
|||
|
|
@ -74,13 +74,24 @@ get_mageia_deps()
|
|||
get_debian_deps()
|
||||
{
|
||||
apt-get -y install \
|
||||
build-essential curl libffi-dev qtbase5-dev libqt5scintilla2-dev \
|
||||
build-essential curl libffi-dev \
|
||||
libxmu-dev cmake bison flex git-core libboost-all-dev \
|
||||
libXi-dev libmpfr-dev libboost-dev libglew-dev \
|
||||
libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev \
|
||||
imagemagick libfontconfig-dev libfreetype6-dev \
|
||||
libharfbuzz-dev gtk-doc-tools libglib2.0-dev gettext \
|
||||
xvfb
|
||||
gtk-doc-tools libglib2.0-dev gettext xvfb pkg-config ragel
|
||||
}
|
||||
|
||||
get_debian_8_deps()
|
||||
{
|
||||
get_debian_deps
|
||||
apt-get -y install libharfbuzz-dev qtbase5-dev libqt5scintilla2-dev
|
||||
}
|
||||
|
||||
get_debian_7_deps()
|
||||
{
|
||||
get_debian_deps
|
||||
apt-get -y install libqt4-dev libqscintilla2-dev
|
||||
}
|
||||
|
||||
unknown()
|
||||
|
|
@ -92,8 +103,10 @@ unknown()
|
|||
if [ -e /etc/issue ]; then
|
||||
if [ "`grep -i ubuntu /etc/issue`" ]; then
|
||||
get_debian_deps
|
||||
elif [ "`grep -i debian.GNU.Linux.7 /etc/issue`" ]; then
|
||||
get_debian_7_deps
|
||||
elif [ "`grep -i debian /etc/issue`" ]; then
|
||||
get_debian_deps
|
||||
get_debian_8_deps
|
||||
elif [ "`grep -i raspbian /etc/issue`" ]; then
|
||||
get_debian_deps
|
||||
elif [ "`grep -i mint /etc/issue`" ]; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue