Bläddra i källkod

Fix toxcore installation

Bob Mottram 6 år sedan
förälder
incheckning
1308cf69ac
1 ändrade filer med 10 tillägg och 8 borttagningar
  1. 10
    8
      src/freedombone-app-tox

+ 10
- 8
src/freedombone-app-tox Visa fil

@@ -479,13 +479,13 @@ function mesh_tox_node {
479 479
         chroot "${rootdir}" apt-get -yq install automake checkinstall check git yasm
480 480
         chroot "${rootdir}" apt-get -yq install libsodium18 libsodium-dev libcap2-bin
481 481
         chroot "${rootdir}" apt-get -yq install libconfig9 libconfig-dev autoconf
482
-        chroot "${rootdir}" apt-get -yq install libopus-dev libvpx-dev
482
+        chroot "${rootdir}" apt-get -yq install libopus-dev libvpx-dev cmake
483 483
     else
484 484
         apt-get -yq install build-essential libtool autotools-dev
485 485
         apt-get -yq install automake checkinstall check git yasm
486 486
         apt-get -yq install libsodium18 libsodium-dev libcap2-bin
487 487
         apt-get -yq install libconfig9 libconfig-dev autoconf
488
-        apt-get -yq install libopus-dev libvpx-dev
488
+        apt-get -yq install libopus-dev libvpx-dev cmake
489 489
     fi
490 490
 
491 491
     if [ ! -d "${rootdir}${INSTALL_DIR}" ]; then
@@ -509,18 +509,20 @@ function mesh_tox_node {
509 509
     if [ "${rootdir}" ]; then
510 510
         chroot "${rootdir}" /bin/bash -x <<EOF
511 511
 cd ${INSTALL_DIR}/toxcore
512
-autoreconf -i
513
-./configure --enable-daemon --prefix=/usr/local
514
-make clean
512
+./autogen.sh
513
+mkdir _build
514
+cd _build || exit 1
515
+cmake ..
515 516
 make
516 517
 make install
517 518
 EOF
518 519
     else
519 520
         /bin/bash -x <<EOF
520 521
 cd ${INSTALL_DIR}/toxcore
521
-autoreconf -i
522
-./configure --enable-daemon --prefix=/usr/local
523
-make clean
522
+./autogen.sh
523
+mkdir _build
524
+cd _build || exit 1
525
+cmake ..
524 526
 make
525 527
 make install
526 528
 EOF