Fix toxcore installation

This commit is contained in:
Bob Mottram 2018-04-20 20:41:41 +01:00
parent 15d71bafb9
commit 1308cf69ac
1 changed files with 10 additions and 8 deletions

View File

@ -479,13 +479,13 @@ function mesh_tox_node {
chroot "${rootdir}" apt-get -yq install automake checkinstall check git yasm chroot "${rootdir}" apt-get -yq install automake checkinstall check git yasm
chroot "${rootdir}" apt-get -yq install libsodium18 libsodium-dev libcap2-bin chroot "${rootdir}" apt-get -yq install libsodium18 libsodium-dev libcap2-bin
chroot "${rootdir}" apt-get -yq install libconfig9 libconfig-dev autoconf chroot "${rootdir}" apt-get -yq install libconfig9 libconfig-dev autoconf
chroot "${rootdir}" apt-get -yq install libopus-dev libvpx-dev chroot "${rootdir}" apt-get -yq install libopus-dev libvpx-dev cmake
else else
apt-get -yq install build-essential libtool autotools-dev apt-get -yq install build-essential libtool autotools-dev
apt-get -yq install automake checkinstall check git yasm apt-get -yq install automake checkinstall check git yasm
apt-get -yq install libsodium18 libsodium-dev libcap2-bin apt-get -yq install libsodium18 libsodium-dev libcap2-bin
apt-get -yq install libconfig9 libconfig-dev autoconf apt-get -yq install libconfig9 libconfig-dev autoconf
apt-get -yq install libopus-dev libvpx-dev apt-get -yq install libopus-dev libvpx-dev cmake
fi fi
if [ ! -d "${rootdir}${INSTALL_DIR}" ]; then if [ ! -d "${rootdir}${INSTALL_DIR}" ]; then
@ -509,18 +509,20 @@ function mesh_tox_node {
if [ "${rootdir}" ]; then if [ "${rootdir}" ]; then
chroot "${rootdir}" /bin/bash -x <<EOF chroot "${rootdir}" /bin/bash -x <<EOF
cd ${INSTALL_DIR}/toxcore cd ${INSTALL_DIR}/toxcore
autoreconf -i ./autogen.sh
./configure --enable-daemon --prefix=/usr/local mkdir _build
make clean cd _build || exit 1
cmake ..
make make
make install make install
EOF EOF
else else
/bin/bash -x <<EOF /bin/bash -x <<EOF
cd ${INSTALL_DIR}/toxcore cd ${INSTALL_DIR}/toxcore
autoreconf -i ./autogen.sh
./configure --enable-daemon --prefix=/usr/local mkdir _build
make clean cd _build || exit 1
cmake ..
make make
make install make install
EOF EOF